===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.241
retrieving revision 1.242
diff -c -r1.241 -r1.242
*** src/usr.bin/cvs/file.c	2008/06/09 17:05:49	1.241
--- src/usr.bin/cvs/file.c	2008/06/09 22:31:24	1.242
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.241 2008/06/09 17:05:49 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.242 2008/06/09 22:31:24 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 879,885 ****
  					    "in the repository but is "
  					    "locally modified",
  					    cf->file_path);
! 					cf->file_status = FILE_CONFLICT;
  				} else if (cvs_cmdop != CVS_OP_IMPORT) {
  					cvs_log(LP_NOTICE,
  					    "%s is no longer in the "
--- 879,888 ----
  					    "in the repository but is "
  					    "locally modified",
  					    cf->file_path);
! 					if (cvs_cmdop == CVS_OP_COMMIT)
! 						cf->file_status = FILE_UNLINK;
! 					else
! 						cf->file_status = FILE_CONFLICT;
  				} else if (cvs_cmdop != CVS_OP_IMPORT) {
  					cvs_log(LP_NOTICE,
  					    "%s is no longer in the "
***************
*** 904,916 ****
  					cf->file_status = FILE_MODIFIED;
  				else
  					cf->file_status = FILE_UPTODATE;
- 
  				if (rcsnum_differ(cf->file_ent->ce_rev,
  				    cf->file_rcsrev)) {
  					if (cf->file_status == FILE_MODIFIED)
  						cf->file_status = FILE_MERGE;
  					else
  						cf->file_status = FILE_PATCH;
  				}
  			}
  		}
--- 907,921 ----
  					cf->file_status = FILE_MODIFIED;
  				else
  					cf->file_status = FILE_UPTODATE;
  				if (rcsnum_differ(cf->file_ent->ce_rev,
  				    cf->file_rcsrev)) {
  					if (cf->file_status == FILE_MODIFIED)
  						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;
  				}
  			}
  		}