diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-06 08:46:56 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-06 08:46:56 +0000 |
| commit | a6b29eb3d5f6efde8045f33f7525945373dd627f (patch) | |
| tree | a68367802cfea15ebc83a08697be01ec7febe3cc /usr.bin | |
| parent | 4584170e9c4f9658ed8295881f7d068d49e70468 (diff) | |
if the submitted rev(s) is/are the same as the head rev, skip the process
for the specified file. Fix some error messages while there. OK joris@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 8 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 23 |
2 files changed, 16 insertions, 15 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index b6037d29e38..71e8dfbee75 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.15 2006/03/05 16:34:31 niallo Exp $ */ +/* $OpenBSD: diff3.c,v 1.16 2006/03/06 08:46:55 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,7 +72,7 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.15 2006/03/05 16:34:31 niallo Exp $"; + "$OpenBSD: diff3.c,v 1.16 2006/03/06 08:46:55 xsa Exp $"; #endif /* not lint */ #include "includes.h" @@ -241,8 +241,8 @@ cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2) goto out; if (diff3_conflicts != 0) { - cvs_printf("%d conflict%s found during merge, " - "please correct.\n", diff3_conflicts, + cvs_log(LP_WARN, "%d conflict%s found during merge, " + "please correct.", diff3_conflicts, (diff3_conflicts > 1) ? "s" : ""); } diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index e0dfb55a154..980bd55f7b2 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,6 +1,6 @@ -/* $OpenBSD: rcsmerge.c,v 1.13 2006/01/05 10:28:24 xsa Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.14 2006/03/06 08:46:55 xsa Exp $ */ /* - * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> + * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,8 +42,10 @@ rcsmerge_main(int argc, char **argv) baserev = rev2 = RCS_HEAD_REV; - while ((ch = rcs_getopt(argc, argv, "k:p::q::r:TVx:")) != -1) { + 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,7 +69,7 @@ rcsmerge_main(int argc, char **argv) else if (rev2 == RCS_HEAD_REV) rcs_set_rev(rcs_optarg, &rev2); else - cvs_log(LP_WARN, "ignored excessive -r option"); + fatal("too many revision numbers"); break; case 'T': /* @@ -107,12 +109,17 @@ rcsmerge_main(int argc, char **argv) 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; - printf("RCS file: %s\n", fpath); + 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,12 +143,6 @@ rcsmerge_main(int argc, char **argv) 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); } |