===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -c -r1.153 -r1.154
*** src/usr.bin/cvs/file.c	2006/05/30 21:32:52	1.153
--- src/usr.bin/cvs/file.c	2006/05/30 22:06:13	1.154
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.153 2006/05/30 21:32: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.154 2006/05/30 22:06:13 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 618,624 ****
  		if (cf->file_rcs == NULL)
  			fatal("cvs_file_classify: failed to parse RCS");
  		cf->file_rcs->rf_inattic = 0;
! 	} else {
  		xfree(cf->file_rpath);
  		l = snprintf(rcsfile, MAXPATHLEN, "%s/%s/%s%s",
  		    repo, CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
--- 618,625 ----
  		if (cf->file_rcs == NULL)
  			fatal("cvs_file_classify: failed to parse RCS");
  		cf->file_rcs->rf_inattic = 0;
! 	} else if (cvs_cmdop != CVS_OP_UPDATE && cvs_cmdop != CVS_OP_CHECKOUT
! 	    && cvs_cmdop != CVS_OP_COMMIT) {
  		xfree(cf->file_rpath);
  		l = snprintf(rcsfile, MAXPATHLEN, "%s/%s/%s%s",
  		    repo, CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
***************
*** 637,643 ****
  		} else {
  			cf->file_rcs = NULL;
  		}
! 	}
  
  	if (tag != NULL && cf->file_rcs != NULL)
  		cf->file_rcsrev = rcs_translate_tag(tag, cf->file_rcs);
--- 638,645 ----
  		} else {
  			cf->file_rcs = NULL;
  		}
! 	} else
! 		cf->file_rcs = NULL;
  
  	if (tag != NULL && cf->file_rcs != NULL)
  		cf->file_rcsrev = rcs_translate_tag(tag, cf->file_rcs);