===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -c -r1.126 -r1.127
*** src/usr.bin/cvs/update.c	2008/02/09 13:09:33	1.126
--- src/usr.bin/cvs/update.c	2008/02/09 17:01:43	1.127
***************
*** 1,4 ****
! /*	$OpenBSD: update.c,v 1.126 2008/02/09 13:09:33 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: update.c,v 1.127 2008/02/09 17:01:43 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 405,411 ****
  	case FILE_LOST:
  	case FILE_CHECKOUT:
  	case FILE_PATCH:
! 		if ((tag != NULL && !reset_tag) ||
  		    (((cf->file_ent != NULL) && cf->file_ent->ce_tag != NULL) &&
  		    !reset_tag))
  			flags = CO_SETSTICKY;
--- 405,411 ----
  	case FILE_LOST:
  	case FILE_CHECKOUT:
  	case FILE_PATCH:
! 		if ((tag != NULL && !reset_tag) || cvs_specified_date != 0 ||
  		    (((cf->file_ent != NULL) && cf->file_ent->ce_tag != NULL) &&
  		    !reset_tag))
  			flags = CO_SETSTICKY;
***************
*** 441,448 ****
  		if (cvs_cmdop != CVS_OP_UPDATE)
  			break;
  
! 		if (tag != NULL && cf->file_rcs->rf_dead != 1 &&
! 		    (cf->file_flags & FILE_HAS_TAG))
  			cvs_checkout_file(cf, cf->file_rcsrev,
  			    tag, CO_SETSTICKY);
  		break;
--- 441,448 ----
  		if (cvs_cmdop != CVS_OP_UPDATE)
  			break;
  
! 		if ((tag != NULL && cf->file_rcs->rf_dead != 1 &&
! 		    (cf->file_flags & FILE_HAS_TAG)) || cvs_specified_date != 0)
  			cvs_checkout_file(cf, cf->file_rcsrev,
  			    tag, CO_SETSTICKY);
  		break;