===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/co.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -c -r1.122 -r1.123
*** src/usr.bin/rcs/co.c	2015/10/21 16:06:57	1.122
--- src/usr.bin/rcs/co.c	2017/08/29 16:47:33	1.123
***************
*** 1,4 ****
! /*	$OpenBSD: co.c,v 1.122 2015/10/21 16:06:57 millert Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: co.c,v 1.123 2017/08/29 16:47:33 otto Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 511,524 ****
  	if (!(flags & CO_STATE))
  		state = NULL;
  
! 	warnx("%s: No revision on branch has%s%s%s%s%s%s.",
  	    file->rf_path,
! 	    date ? " a date before " : "",
  	    date ? date : "",
! 	    author ? " and author " + (date ? 0:4) : "",
  	    author ? author : "",
! 	    state  ? " and state " + (date || author ? 0:4) : "",
! 	    state  ? state : "");
  }
  
  /*
--- 511,527 ----
  	if (!(flags & CO_STATE))
  		state = NULL;
  
! 	warnx("%s: No revision on branch has %s%s%s%s%s%s%s%s.",
  	    file->rf_path,
! 	    date ? "a date before " : "",
  	    date ? date : "",
! 	    (date && author) ? " and " : "",
! 	    author ? "author " : "",
  	    author ? author : "",
! 	    ((date || author) && state) ? " and " : "",
! 	    state ? "state " : "",
! 	    state ? state : "");
! 
  }
  
  /*