From: nicm <nicm@openbsd.org>
Date: Tue, 13 Jul 2010 20:47:19 +0000 (+0000)
Subject: Do not put the file into conflict if it is no longer modified (user has
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=50b68c3e7e3ba045abd01917b1efdcc52efebb29;p=openbsd

Do not put the file into conflict if it is no longer modified (user has
edited it back to repository state).

ok zinovik
---

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;
 				}
 			}
 		}