diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-03-01 22:35:45 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-03-01 22:35:45 +0000 |
| commit | 37f21c019fde3d15978aecdb3d321722e6fb810a (patch) | |
| tree | aff0c5f058f29f5261dddab39799ebb4ca947aec /usr.bin/cvs/update.c | |
| parent | 1a75674d9eb7a43971bc7f9ef98e497d68c6f6c9 (diff) | |
use file_rcsrev in update_clear_conflict() - this way
we will always pick up the correct revision.
Diffstat (limited to 'usr.bin/cvs/update.c')
| -rw-r--r-- | usr.bin/cvs/update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 5334528444e..c7c704a572f 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.133 2008/02/28 21:55:48 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.134 2008/03/01 22:35:44 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -473,7 +473,7 @@ update_clear_conflict(struct cvs_file *cf) ctime_r(&now, timebuf); timebuf[strcspn(timebuf, "\n")] = '\0'; - rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf)); + rcsnum_tostr(cf->file_rcsrev, revbuf, sizeof(revbuf)); sticky[0] = '\0'; if (cf->file_ent->ce_tag != NULL) |