diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-02 11:26:20 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-02 11:26:20 +0000 |
| commit | f1d8638fc2569231ba3f28f06d3b32ae54a75367 (patch) | |
| tree | f28fb8b496a187c789b2505022547dbbcf129fc3 /usr.bin/rcs | |
| parent | 50da2b65ef33f6465a9caa7653c00285689e2241 (diff) | |
sync with Reality;
Diffstat (limited to 'usr.bin/rcs')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 10 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index 133c15413a4..6267f4cc4a5 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.1 2005/10/18 16:16:39 xsa Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.2 2005/11/02 11:26:19 xsa Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -23,8 +23,10 @@ .Sh SYNOPSIS .Nm .Bk -words -.Op Fl AEepqTV +.Op Fl AEeTV .Op Fl k Ns Ar mode +.Op Fl p Ns Op Ar rev +.Op Fl q Ns Op Ar rev .Op Fl r Ns Ar rev .Op Fl x Ns Ar suffixes .Op Fl z Ns Ar tz @@ -53,9 +55,9 @@ Same as but does not warn about conflicts. .It Fl k Ns Ar mode Specify the keyword substitution mode. -.It Fl p +.It Fl p Ns Op Ar rev Print result to standard output. -.It Fl q +.It Fl q Ns Op Ar rev Be quiet about reporting. .It Fl r Ns Ar rev Merge with respect to revision diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index 7cc22876173..e15b82519b7 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.6 2005/10/26 18:13:58 xsa Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.7 2005/11/02 11:26:19 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -50,7 +50,7 @@ rcsmerge_main(int argc, char **argv) baserev = rev2 = RCS_HEAD_REV; - while ((ch = rcs_getopt(argc, argv, "k:p::qr:TV")) != -1) { + while ((ch = rcs_getopt(argc, argv, "k:p::q::r:TV")) != -1) { switch (ch) { case 'k': kflag = rcs_kflag_get(rcs_optarg); @@ -66,6 +66,7 @@ rcsmerge_main(int argc, char **argv) pipeout = 1; break; case 'q': + rcs_set_rev(rcs_optarg, &baserev); verbose = 0; break; case 'r': @@ -154,5 +155,6 @@ void rcsmerge_usage(void) { fprintf(stderr, - "usage: rcsmerge [-qTV] [-kmode] [-rrev] file ...\n"); + "usage: rcsmerge [-TV] [-kmode] [-p[rev]] [-q[rev]] " + "[-rrev] file ...\n"); } |