===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/remote.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- src/usr.bin/cvs/remote.c	2009/04/01 06:41:58	1.26
+++ src/usr.bin/cvs/remote.c	2009/04/02 20:57:47	1.27
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remote.c,v 1.26 2009/04/01 06:41:58 joris Exp $	*/
+/*	$OpenBSD: remote.c,v 1.27 2009/04/02 20:57:47 joris Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -271,7 +271,8 @@
 			fatal("cvs_remote_classify_file(%s): %s", cf->file_path,
 			    strerror(errno));
 
-		if (st.st_mtime != cf->file_ent->ce_mtime || cf->file_ent != NULL)
+		if (st.st_mtime != cf->file_ent->ce_mtime ||
+		    cf->file_ent->ce_conflict != NULL)
 			cf->file_status = FILE_MODIFIED;
 		else
 			cf->file_status = FILE_UPTODATE;