===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/remove.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/cvs/remove.c	2005/08/22 11:17:26	1.35
--- src/usr.bin/cvs/remove.c	2005/09/06 17:08:05	1.36
***************
*** 1,4 ****
! /*	$OpenBSD: remove.c,v 1.35 2005/08/22 11:17:26 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: remove.c,v 1.36 2005/09/06 17:08:05 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org>
***************
*** 150,155 ****
--- 150,156 ----
  	int existing, l, removed;
  	char buf[MAXPATHLEN], fpath[MAXPATHLEN];
  	CVSENTRIES *entf;
+ 	struct cvs_ent *ent;
  
  	existing = removed = 0;
  	entf = (CVSENTRIES *)cf->cf_entry;
***************
*** 202,209 ****
  			    cf->cf_name);
  		return (0);
  	} else {
  
! 		/* XXX prefix file version with the `-' char in CVS/Entries */
  
  		if (verbosity > 1)
  			cvs_log(LP_NOTICE, "scheduling file `%s' for removal",
--- 203,214 ----
  			    cf->cf_name);
  		return (0);
  	} else {
+ 		if ((ent = cvs_ent_get(entf, cf->cf_name)) == NULL)
+ 			return (CVS_EX_DATA);
  
! 		/* Prefix revision with `-' */
! 		ent->ce_status = CVS_ENT_REMOVED;
! 		entf->cef_flags &= ~CVS_ENTF_SYNC;
  
  		if (verbosity > 1)
  			cvs_log(LP_NOTICE, "scheduling file `%s' for removal",