===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/rcs/rcsmerge.c	2006/01/05 10:28:24	1.13
--- src/usr.bin/rcs/rcsmerge.c	2006/03/06 08:46:55	1.14
***************
*** 1,6 ****
! /*	$OpenBSD: rcsmerge.c,v 1.13 2006/01/05 10:28:24 xsa Exp $	*/
  /*
!  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,6 ----
! /*	$OpenBSD: rcsmerge.c,v 1.14 2006/03/06 08:46:55 xsa Exp $	*/
  /*
!  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 42,49 ****
  
  	baserev = rev2 = RCS_HEAD_REV;
  
! 	while ((ch = rcs_getopt(argc, argv, "k:p::q::r:TVx:")) != -1) {
  		switch (ch) {
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
--- 42,51 ----
  
  	baserev = rev2 = RCS_HEAD_REV;
  
! 	while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r:TVx:")) != -1) {
  		switch (ch) {
+ 		case 'A': case 'E': case 'e':
+ 			break;
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
***************
*** 67,73 ****
  			else if (rev2 == RCS_HEAD_REV)
  				rcs_set_rev(rcs_optarg, &rev2);
  			else
! 				cvs_log(LP_WARN, "ignored excessive -r option");
  			break;
  		case 'T':
  			/*
--- 69,75 ----
  			else if (rev2 == RCS_HEAD_REV)
  				rcs_set_rev(rcs_optarg, &rev2);
  			else
! 				fatal("too many revision numbers");
  			break;
  		case 'T':
  			/*
***************
*** 107,118 ****
  		if ((file = rcs_open(fpath, RCS_READ)) == NULL)
  			continue;
  
  		if (rev2 == RCS_HEAD_REV)
  			frev = file->rf_head;
  		else
  			frev = rev2;
  
! 		printf("RCS file: %s\n", fpath);
  
  		if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) {
  			cvs_log(LP_ERR, "failed to merge");
--- 109,125 ----
  		if ((file = rcs_open(fpath, RCS_READ)) == NULL)
  			continue;
  
+ 		printf("RCS file: %s\n", fpath);
+ 
  		if (rev2 == RCS_HEAD_REV)
  			frev = file->rf_head;
  		else
  			frev = rev2;
  
! 		if (rcsnum_cmp(baserev, frev, 0) == 0) {
! 			rcs_close(file);
! 			continue;
! 		}
  
  		if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) {
  			cvs_log(LP_ERR, "failed to merge");
***************
*** 136,147 ****
  
  			cvs_buf_free(bp);
  		}
- 
- 		if (diff3_conflicts > 0) {
- 			cvs_log(LP_WARN, "%d conflict%s found during merge",
- 			    diff3_conflicts, (diff3_conflicts > 1) ? "s": "");
- 		}
- 
  		rcs_close(file);
  	}
  
--- 143,148 ----