diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-03-08 22:54:59 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-03-08 22:54:59 +0000 |
| commit | b6d83e0302186562476de36c36fad3a2ad6e5289 (patch) | |
| tree | 846e9a7e3bd3d2661e2578d1aca1f1dc147b8015 /usr.bin/cvs/update.c | |
| parent | 4d46e1ca76adde886e8aa279d4e7c0679c6f599f (diff) | |
do not log successfull merges in CVSROOT/history when joining.
Diffstat (limited to 'usr.bin/cvs/update.c')
| -rw-r--r-- | usr.bin/cvs/update.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index ad69b5eafa4..45f886337b4 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.137 2008/03/08 22:33:03 joris Exp $ */ +/* $OpenBSD: update.c,v 1.138 2008/03/08 22:54:58 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -677,10 +677,8 @@ update_join_file(struct cvs_file *cf) d3rev2 = rev2; cvs_checkout_file(cf, cf->file_rcsrev, NULL, CO_MERGE); - if (diff3_conflicts == 0) { + if (diff3_conflicts == 0) update_clear_conflict(cf); - cvs_history_add(CVS_HISTORY_UPDATE_MERGED, cf, NULL); - } out: if (rev1 != NULL) |