2.8 Invoking Rcsdiff

You might also like

Download as pdf or txt
Download as pdf or txt
You are on page 1of 1

Chapter 2: Usage 17

2.8 Invoking rcsdiff


rcs diff [options] file ...
(or “rcsdiff” instead of “rcs diff”)
The rcsdiff command runs diff to compare two revisions in an RCS file. See Section “In-
voking diff” in The GNU Diffutils Manaual.
-rrev (zero, one, or two times) Name a revision. If given two revisions (‘-rrev1
-rrev2’), compare those revisions. If given only one revision (‘-rrev’), compare
the working file with it. If given no revisions, compare the working file with the
latest revision on the default branch.
-ksubst See Section 2.1.4 [Substitution mode option], page 8.
-q See Section 2.1.6 [Misc common options], page 9.
-V
-Vn
-xsuff See Section 2.1.6 [Misc common options], page 9.
-zzone See Section 2.1.2 [Date option], page 8.
These options have no effect, and are included solely for consistency with other comamnds
(see Section 2.1.7 [Environment], page 10): -T.
Additionally, the following options (and their argument, if any) are passed to the underlying
diff command:
-0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -B, -C, -D, -F, -H, -I,
-L, -U, -W, -a, -b, -c, -d, -e, -f, -h, -i, -n, -p, -t, -u, -w, -y,
long options (that start with "--")
(Not all of these options are meaningful.)

2.9 Invoking rcsmerge


rcs merge [options] file
(or “rcsmerge” instead of “rcs merge”)
The rcsmerge command incorporates the changes between two revisions of an RCS file into
the corresponding working file.
-A
-E
-e Passed to the diff3 command. The default if none are specified is -E. With -e,
suppress warnings on conflict. The -A style generates the most verbose output.
See Section “Invoking diff3” in The GNU Diffutils Manual.
-p[rev] Write to stdout instead of overwriting the working file.
-q[rev] See Section 2.1.6 [Misc common options], page 9.
-rrev (one or two times) specify a revision.
One or two revisions must be specified (using -p, -q, -r). If only one is specified, the second
revision defaults to the latest revision on the default branch.

You might also like