===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/co.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** src/usr.bin/rcs/co.c	2006/04/06 10:13:00	1.70
--- src/usr.bin/rcs/co.c	2006/04/09 19:22:23	1.71
***************
*** 1,4 ****
! /*	$OpenBSD: co.c,v 1.70 2006/04/06 10:13:00 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: co.c,v 1.71 2006/04/09 19:22:23 niallo Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 313,320 ****
  		}
  	}
  
! 	if ((verbose == 1) && !(flags & NEWFILE))
  		printf("revision %s", buf);
  
  
  	if ((bp = rcs_getrev(file, rev)) == NULL) {
--- 313,323 ----
  		}
  	}
  
! 	if ((verbose == 1) && !(flags & NEWFILE) && !(flags & CO_REVERT))
  		printf("revision %s", buf);
+ 	
+ 	if ((verbose == 1) && (flags & CO_REVERT))
+ 		printf("done");
  
  
  	if ((bp = rcs_getrev(file, rev)) == NULL) {
***************
*** 346,352 ****
  		mode = st.st_mode &
  		    (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH);
  		mode |= S_IWUSR;
! 		if ((verbose == 1) && !(flags & NEWFILE))
  			printf(" (locked)");
  	} else if (flags & CO_UNLOCK) {
  		if (rcs_lock_remove(file, lockname, rev) < 0) {
--- 349,356 ----
  		mode = st.st_mode &
  		    (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH);
  		mode |= S_IWUSR;
! 		if ((verbose == 1) && !(flags & NEWFILE)
! 		    && !(flags & CO_REVERT))
  			printf(" (locked)");
  	} else if (flags & CO_UNLOCK) {
  		if (rcs_lock_remove(file, lockname, rev) < 0) {
***************
*** 357,363 ****
  		/* Strip all write bits from mode */
  		mode = st.st_mode &
  		    (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH);
! 		if ((verbose == 1) && !(flags & NEWFILE))
  			printf(" (unlocked)");
  	}
  
--- 361,368 ----
  		/* Strip all write bits from mode */
  		mode = st.st_mode &
  		    (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH);
! 		if ((verbose == 1) && !(flags & NEWFILE)
! 		    && !(flags & CO_REVERT))
  			printf(" (unlocked)");
  	}
  
***************
*** 365,372 ****
  		printf("\n");
  
  	if (flags & CO_LOCK) {
! 		lcount++;
! 		if ((verbose == 1) && (lcount > 1))
  			cvs_log(LP_WARN, "%s: warning: You now have %d locks.",
  			    file->rf_path, lcount);
  	}
--- 370,378 ----
  		printf("\n");
  
  	if (flags & CO_LOCK) {
! 		if (rcs_errno != RCS_ERR_DUPENT)
! 			lcount++;
! 		if ((verbose == 1) && (lcount > 1) && !(flags & CO_REVERT))
  			cvs_log(LP_WARN, "%s: warning: You now have %d locks.",
  			    file->rf_path, lcount);
  	}