[patch] Help/man pages sync

Honza Horak <[email protected]> Thu, 04 Apr 2013 15:07:57 +0200

Newsgroups	gmane.comp.version-control.rcs.bugs
Message-ID	<[email protected]>

Hi guys,

while doing some cleaning work in Fedora packages we've found some "man 
page vs. help" issues. A patch with fix for the issues is attached.

Missing -T in help can be intentional, since it is NOP in some of the 
utilities, but it may confuse users, so I added that to the patch as well.

Cheers,
Honza

rcs-master-manhelp.patch (text/x-patch, 1.8 KB)

diff --git a/src/rcsdiff.c b/src/rcsdiff.c
index 7f194d4..84ae3b2 100644
--- a/src/rcsdiff.c
+++ b/src/rcsdiff.c
@@ -476,6 +476,7 @@ Options:
   -rREV         (zero, one, or two times) Name a revision.
   -kSUBST       Substitute using mode SUBST (see co(1)).
   -q            Quiet mode.
+  -T            No effect; it is present for compatibility with other RCS commands.
   -V            Like --version.
   -VN           Emulate RCS version N.
   -xSUFF        Specify SUFF as a slash-separated list of suffixes
diff --git a/src/rcsmerge.c b/src/rcsmerge.c
index 10c235b..0dacfaa 100644
--- a/src/rcsmerge.c
+++ b/src/rcsmerge.c
@@ -218,10 +218,13 @@ const uint8_t rcsmerge_aka[16] =
 /*:help
 [options] file
 Options:
+  -A            Merge all changes leading from file2 to file3 into file1.
+  -E|-e         Specify conflict styles that generate less information than -A.
   -p[REV]       Write to stdout instead of overwriting the working file.
   -q[REV]       Quiet mode.
   -rREV         (one or two times) specify a revision.
   -kSUBST       Substitute using mode SUBST (see co(1)).
+  -T            No effect; it is present for compatibility with other RCS commands.
   -V            Like --version.
   -VN           Emulate RCS version N.
   -xSUFF        Specify SUFF as a slash-separated list of suffixes
diff --git a/src/rlog.c b/src/rlog.c
index 8bf8386..fa65cef 100644
--- a/src/rlog.c
+++ b/src/rlog.c
@@ -1029,6 +1029,7 @@ Options:
   -sSTATES      Select revisions with state in STATES (comma-separated list).
   -w[WHO]       Select revisions checked in by WHO (comma-separated list),
                 or by the user if WHO is omitted.
+  -T            No effect; it is present for compatibility with other RCS commands.
   -V            Like --version.
   -VN           Emulate RCS version N.
   -xSUFF        Specify SUFF as a slash-separated list of suffixes