rcsmerge(1) General Commands Manual rcsmerge(1)
NAME
rcsmerge - merge RCS revisions
SYNOPSIS
rev2] file
DESCRIPTION
incorporates the changes between rev1 and rev2 of an RCS file into the corresponding working file. If is given, the result is printed on
the standard output; otherwise the result overwrites the working file.
A file name ending in is an RCS file name; otherwise it is a working file name. derives the working file name from the RCS file name and
vice versa, as explained in rcsintro(5). A pair consisting of both an RCS and a working file name can also be specified.
rev1 cannot be omitted. If rev2 is omitted, the latest revision on the trunk is assumed. Both rev1 and rev2 can be given numerically or
symbolically.
prints a warning if there are overlaps, and delimits the overlapping regions as explained for the option of co(1). The command is useful
for incorporating changes into a checked-out revision.
EXAMPLES
Suppose you have released revision 2.8 of Assume furthermore that you just completed revision 3.4 when 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 and execute:
Then examine Alternatively, if you want to save the updates to 2.8 in the RCS file, check them in as revision 2.8.1.1 and execute
As another example, the following command undoes the changes between revision 2.4 and 2.8 in your currently checked out revision in
Note the order of the arguments, and that is overwritten.
WARNINGS
does not work for files that contain lines with a single
AUTHOR
was developed by Walter F. Tichy.
SEE ALSO
ci(1), co(1), merge(1), ident(1), rcs(1), rcsdiff(1), rlog(1), rcsfile(4).
rcsmerge(1)