===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -c -r1.248 -r1.249
*** src/usr.bin/cvs/file.c	2008/06/14 03:58:29	1.248
--- src/usr.bin/cvs/file.c	2008/06/15 04:38:52	1.249
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.248 2008/06/14 03:58:29 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.249 2008/06/15 04:38:52 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 806,812 ****
  			}
  
  			cf->file_status = FILE_UNKNOWN;
! 		} else if (rcsdead == 1) {
  			if (cf->fd == -1) {
  				cf->file_status = FILE_UPTODATE;
  			} else if (cvs_cmdop != CVS_OP_ADD) {
--- 806,812 ----
  			}
  
  			cf->file_status = FILE_UNKNOWN;
! 		} else if (rcsdead == 1 || !(cf->file_flags & FILE_HAS_TAG)) {
  			if (cf->fd == -1) {
  				cf->file_status = FILE_UPTODATE;
  			} else if (cvs_cmdop != CVS_OP_ADD) {
***************
*** 830,836 ****
  				    cf->file_path);
  			}
  			cf->file_status = FILE_REMOVE_ENTRY;
! 		} else if (cf->file_rcs == NULL || rcsdead == 1) {
  			cf->file_status = FILE_ADDED;
  		} else {
  			cvs_log(LP_NOTICE,
--- 830,837 ----
  				    cf->file_path);
  			}
  			cf->file_status = FILE_REMOVE_ENTRY;
! 		} else if (cf->file_rcs == NULL || rcsdead == 1 ||
! 		    !(cf->file_flags & FILE_HAS_TAG)) {
  			cf->file_status = FILE_ADDED;
  		} else {
  			cvs_log(LP_NOTICE,