===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -c -r1.234 -r1.235
*** src/usr.bin/cvs/file.c	2008/03/09 03:14:52	1.234
--- src/usr.bin/cvs/file.c	2008/03/09 18:02:17	1.235
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.234 2008/03/09 03:14:52 joris 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.235 2008/03/09 18:02:17 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 655,665 ****
  		cf->file_ent = NULL;
  
  	if (cf->file_ent != NULL) {
! 		if (cf->file_ent->ce_type == CVS_ENT_DIR &&
  		    cf->file_type != CVS_DIR)
  			fatal("%s is supposed to be a directory, but it is not",
  			    cf->file_path);
! 		if (cf->file_ent->ce_type == CVS_ENT_FILE &&
  		    cf->file_type != CVS_FILE)
  			fatal("%s is supposed to be a file, but it is not",
  			    cf->file_path);
--- 655,665 ----
  		cf->file_ent = NULL;
  
  	if (cf->file_ent != NULL) {
! 		if (cf->fd != -1 && cf->file_ent->ce_type == CVS_ENT_DIR &&
  		    cf->file_type != CVS_DIR)
  			fatal("%s is supposed to be a directory, but it is not",
  			    cf->file_path);
! 		if (cf->fd != -1 && cf->file_ent->ce_type == CVS_ENT_FILE &&
  		    cf->file_type != CVS_FILE)
  			fatal("%s is supposed to be a file, but it is not",
  			    cf->file_path);
***************
*** 867,874 ****
  			if (cf->fd == -1 && server_has_file == 0) {
  				cvs_log(LP_NOTICE,
  				    "warning: %s's entry exists but"
! 				    " there is no longer a file"
! 				    " in the repository,"
  				    " removing entry",
  				     cf->file_path);
  				cf->file_status = FILE_REMOVE_ENTRY;
--- 867,873 ----
  			if (cf->fd == -1 && server_has_file == 0) {
  				cvs_log(LP_NOTICE,
  				    "warning: %s's entry exists but"
! 				    " is no longer in the repository,"
  				    " removing entry",
  				     cf->file_path);
  				cf->file_status = FILE_REMOVE_ENTRY;