===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -c -r1.103 -r1.104
*** src/usr.bin/cvs/checkout.c	2007/09/22 15:30:29	1.103
--- src/usr.bin/cvs/checkout.c	2007/09/22 16:01:22	1.104
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.103 2007/09/22 15:30:29 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.104 2007/09/22 16:01:22 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 72,77 ****
--- 72,79 ----
  		case 'l':
  			flags &= ~CR_RECURSE_DIRS;
  			break;
+ 		case 'N':
+ 			break;
  		case 'P':
  			prune_dirs = 1;
  			break;
***************
*** 184,189 ****
--- 186,193 ----
  		return;
  	}
  
+ 	cvs_directory_tag = cvs_specified_tag;
+ 
  	for (i = 0; i < argc; i++) {
  		(void)xsnprintf(repo, sizeof(repo), "%s/%s",
  		    current_cvsroot->cr_dir, argv[i]);
***************
*** 258,265 ****
  
  	exists = 0;
  	tosend = NULL;
- 	rcsnum_tostr(rnum, rev, sizeof(rev));
  
  	cvs_log(LP_TRACE, "cvs_checkout_file(%s, %s, %d) -> %s",
  	    cf->file_path, rev, co_flags,
  	    (cvs_server_active) ? "to client" : "to disk");
--- 262,271 ----
  
  	exists = 0;
  	tosend = NULL;
  
+ 	if (!(co_flags & CO_REMOVE))
+ 		rcsnum_tostr(rnum, rev, sizeof(rev));
+ 
  	cvs_log(LP_TRACE, "cvs_checkout_file(%s, %s, %d) -> %s",
  	    cf->file_path, rev, co_flags,
  	    (cvs_server_active) ? "to client" : "to disk");
***************
*** 320,328 ****
  	}
  
  	if (co_flags & CO_SETSTICKY)
! 		if (cvs_specified_tag != NULL)
  			(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
! 			    cvs_specified_tag);
  		else
  			(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
  			    rev);
--- 326,334 ----
  	}
  
  	if (co_flags & CO_SETSTICKY)
! 		if (cvs_directory_tag != NULL)
  			(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
! 			    cvs_directory_tag);
  		else
  			(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
  			    rev);