===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/rcs/rcsmerge.c	2006/04/24 13:32:10	1.33
--- src/usr.bin/rcs/rcsmerge.c	2006/04/25 03:25:42	1.34
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.33 2006/04/24 13:32:10 jmc Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.34 2006/04/25 03:25:42 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 43,49 ****
  	rev1 = rev2 = NULL;
  	rev_str1 = rev_str2 = NULL;
  
! 	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r:TVx::z:")) != -1) {
  		switch (ch) {
  		case 'A': case 'E': case 'e':
  			break;
--- 43,49 ----
  	rev1 = rev2 = NULL;
  	rev_str1 = rev_str2 = NULL;
  
! 	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) {
  		switch (ch) {
  		case 'A': case 'E': case 'e':
  			break;
***************
*** 64,70 ****
  			flags |= QUIET;
  			break;
  		case 'r':
! 			rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg);
  			break;
  		case 'T':
  			/*
--- 64,71 ----
  			flags |= QUIET;
  			break;
  		case 'r':
! 			rcs_setrevstr2(&rev_str1, &rev_str2,
! 			    rcs_optarg ? rcs_optarg : "");
  			break;
  		case 'T':
  			/*
***************
*** 122,130 ****
  			rev2 = NULL;
  		}
  
! 		if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
  			fatal("invalid revision: %s", rev_str1);
! 		if (rev_str2 != NULL) {
  			if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
  				fatal("invalid revision: %s", rev_str2);
  		} else {
--- 123,135 ----
  			rev2 = NULL;
  		}
  
! 		if (strcmp(rev_str1, "") == 0) {
! 			rev1 = rcsnum_alloc();
! 			rcsnum_cpy(file->rf_head, rev1, 0);
! 		} else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
  			fatal("invalid revision: %s", rev_str1);
! 
! 		if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) {
  			if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
  				fatal("invalid revision: %s", rev_str2);
  		} else {