diff options
| author |   nicm <nicm@openbsd.org> | 2010-07-13 20:47:19 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-07-13 20:47:19 +0000 |
| commit | 50b68c3e7e3ba045abd01917b1efdcc52efebb29 (patch) | |
| tree | 06a765c3b4a4253c7cfdf76e78b21b6b4cc610e7 | |
| parent | PR 6423 fix for cvs too, requested by xsa@. (diff) | |
| download | wireguard-openbsd-50b68c3e7e3ba045abd01917b1efdcc52efebb29.tar.xz wireguard-openbsd-50b68c3e7e3ba045abd01917b1efdcc52efebb29.zip | |
Do not put the file into conflict if it is no longer modified (user has
edited it back to repository state).
ok zinovik
| -rw-r--r-- | usr.bin/cvs/file.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index bc350ee36b4..1150d4aec1c 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.258 2009/03/28 16:47:33 joris Exp $ */ +/* $OpenBSD: file.c,v 1.259 2010/07/13 20:47:19 nicm Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -956,9 +956,6 @@ cvs_file_classify(struct cvs_file *cf, const char *tag) cf->file_status = FILE_MERGE; else cf->file_status = FILE_PATCH; - } else if (cf->file_ent->ce_conflict != NULL && - cf->file_status != FILE_MODIFIED) { - cf->file_status = FILE_CONFLICT; } } } |