===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -c -r1.158 -r1.159
*** src/usr.bin/cvs/checkout.c	2009/02/21 13:44:18	1.158
--- src/usr.bin/cvs/checkout.c	2009/02/21 14:50:53	1.159
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.158 2009/02/21 13:44:18 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.159 2009/02/21 14:50:53 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 494,500 ****
  		(void)unlink(cf->file_path);
  
  		if (!(co_flags & CO_MERGE)) {
! 			if (cf->fd != -1) {
  				exists = 1;
  				(void)close(cf->fd);
  			}
--- 494,500 ----
  		(void)unlink(cf->file_path);
  
  		if (!(co_flags & CO_MERGE)) {
! 			if (cf->file_flags & FILE_ON_DISK) {
  				exists = 1;
  				(void)close(cf->fd);
  			}
***************
*** 506,511 ****
--- 506,512 ----
  				    strerror(errno));
  
  			rcs_rev_write_fd(cf->file_rcs, rnum, cf->fd, 0);
+ 			cf->file_flags |= FILE_ON_DISK;
  		} else {
  			cvs_merge_file(cf, (cvs_join_rev1 == NULL));
  		}