rcsmerge - merge RCS revisions
incorporates the changes between two revisions
of an RCS file into the corresponding working file.
Pathnames matching an RCS suffix denote RCS files;
all others denote working files.
Names are paired as explained in
At least one revision must be specified with one of the options
described below, usually
At most two revisions may be specified.
If only one revision is specified, the latest
revision on the default branch (normally the highest branch on the trunk)
is assumed for the second revision.
Revisions may be specified numerically or symbolically.
prints a warning if there are overlaps, and delimits
the overlapping regions as explained in
The command is useful for incorporating changes into a checked-out revision.
- Output conflicts using the
if supported by
This merges all changes leading from
and generates the most verbose output.
- -E, -e
- These options specify conflict styles that generate less information
The default is
does not warn about conflicts.
style keyword substitution.
-kk -r1.1 -r1.2
ignores differences in keyword values when merging the changes from
It normally does not make sense to merge binary files as if they were text, so
refuses to merge files if
expansion is used.
- Send the result to standard output instead of overwriting the working file.
- Run quietly; do not print diagnostics.
- Merge with respect to revision
Here an empty
stands for the latest revision on the default branch, normally the head.
- This option has no effect;
it is present for compatibility with other RCS commands.
- Print RCS's version number.
- Emulate RCS version
to characterize RCS files.
as the time zone for keyword substitution.
Suppose you have released revision 2.8 of
furthermore that after you complete an unreleased revision 3.4, you receive
updates to release 2.8 from someone else.
To combine the updates to 2.8 and your changes between 2.8 and 3.4,
put the updates to 2.8 into file f.c and execute
rcsmerge -p -r2.8 -r3.4 f.c >f.merged.c
Alternatively, if you want to save the updates to 2.8 in the RCS file,
check them in as revision 220.127.116.11 and execute
ci -r18.104.22.168 f.c
co -r3.4 -j2.8:22.214.171.124 f.c
As another example, the following command undoes the changes
between revision 2.4 and 2.8 in your currently checked out revision
rcsmerge -r2.8 -r2.4 f.c
Note the order of the arguments, and that
- options prepended to the argument list, separated by spaces.
Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.
Author: Walter F. Tichy.
Manual Page Revision: [Rv]; Release Date: [Dt].
Copyright © 1982, 1988, 1989 Walter F. Tichy.
Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1), rlog(1),
Walter F. Tichy,
RCS[-]-A System for Version Control,
Software[-]-Practice & Experience
7 (July 1985), 637-654.