diff options
| author | Niall O'Higgins <niallo@cvs.openbsd.org> | 2006-02-26 16:06:47 +0000 |
|---|---|---|
| committer | Niall O'Higgins <niallo@cvs.openbsd.org> | 2006-02-26 16:06:47 +0000 |
| commit | a8696c56864cd6597f811bdfea2b993d3648b094 (patch) | |
| tree | 948701963bf5b0b38fbcc584690c87924c60b8f1 | |
| parent | e4262cc4bb23cd50a365374d7f2d3ffdcd254aba (diff) | |
also set 'entry' variable in merged case.
fixes PR#5037
From Ray Lai <ray at cyth.net>
"somebody please commit" joris@
| -rw-r--r-- | usr.bin/cvs/rcs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 92150101322..a9f59ebbc89 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.129 2006/02/13 11:02:58 xsa Exp $ */ +/* $OpenBSD: rcs.c,v 1.130 2006/02/26 16:06:46 niallo Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -2931,6 +2931,7 @@ cvs_checkout_rev(RCSFILE *rf, RCSNUM *rev, CVSFILE *cf, char *fpath, } if (type == CHECKOUT_REV_CREATED || + type == CHECKOUT_REV_MERGED || type == CHECKOUT_REV_UPDATED) { ctime_r(&rcstime, timebuf); l = strlen(timebuf); |