diff options
| author |   tobias <tobias@openbsd.org> | 2008-06-09 22:31:24 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2008-06-09 22:31:24 +0000 |
| commit | 09d285070149d577da93c686593c5718d71cf760 (patch) | |
| tree | a5eeaf62f9569bedfa06c460cec16dcbaea23cb0 /usr.bin/cvs/update.c | |
| parent | Remove nmeaattch(8), which is superseeded by ldattach(8). (diff) | |
| download | wireguard-openbsd-09d285070149d577da93c686593c5718d71cf760.tar.xz wireguard-openbsd-09d285070149d577da93c686593c5718d71cf760.zip | |
Properly handle merged files and conflicts which may arrise while merge.
Instead of ignoring all files which contain possible conflict markers,
only watch out for files which have actually been merged.
With input by and ok joris.
Diffstat (limited to 'usr.bin/cvs/update.c')
| -rw-r--r-- | usr.bin/cvs/update.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index dc9a7a965c4..32a6c7cb7db 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.147 2008/06/08 16:32:34 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.148 2008/06/09 22:31:24 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -477,15 +477,11 @@ update_clear_conflict(struct cvs_file *cf) { time_t now; CVSENTRIES *entlist; - char *entry, revbuf[CVS_REV_BUFSZ], timebuf[CVS_TIME_BUFSZ]; + char *entry, revbuf[CVS_REV_BUFSZ]; char sticky[CVS_ENT_MAXLINELEN], opt[4]; cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path); - time(&now); - ctime_r(&now, timebuf); - timebuf[strcspn(timebuf, "\n")] = '\0'; - rcsnum_tostr(cf->file_rcsrev, revbuf, sizeof(revbuf)); sticky[0] = '\0'; @@ -498,7 +494,7 @@ update_clear_conflict(struct cvs_file *cf) strlcpy(opt, cf->file_ent->ce_opts, sizeof(opt)); entry = xmalloc(CVS_ENT_MAXLINELEN); - cvs_ent_line_str(cf->file_name, revbuf, timebuf, + cvs_ent_line_str(cf->file_name, revbuf, "Result of merge", opt[0] != '\0' ? opt : "", sticky, 0, 0, entry, CVS_ENT_MAXLINELEN); |