.TH RCSMERGE 1L "" "Purdue University"
rcsmerge \- merge RCS revisions
\fBrcsmerge\fR \fB\-r\fIrev1\fR [ \fB\-r\fIrev2\fR ] [ \fB\-p\fR ] file
incorporates the changes between \fIrev1\fR and \fIrev2\fR of an
RCS file into the corresponding working file. If \fB\-p\fR is given, the result
is printed on the standard output, otherwise the result overwrites the
A file name ending in ',v' is an RCS file name, otherwise a
working file name. \fIMerge\fR derives the working file name from the RCS
file name and vice versa, as explained in
of both an RCS and a working file name may also be specified.
\fIRev1\fR may not be omitted. If \fIrev2\fR is omitted, the latest
revision on the default branch (normally the highest branch on the trunk)
Both \fIrev1\fR and \fIrev2\fR may be given numerically or symbolically.
\fIRcsmerge\fR prints a warning if there are overlaps, and delimits
the overlapping regions as explained in \fIco \-j\fR.
The command is useful for incorporating changes into a checked-out revision.
Suppose you have released revision 2.8 of f.c. 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 f.c and execute
.B " 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 2.8.1.1 and execute \fIco \-j\fR:
.B " co \-r3.4 \-j2.8:2.8.1.1 f.c
As another example, the following command undoes the changes
between revision 2.4 and 2.8 in your currently checked out revision
.B " rcsmerge \-r2.8 \-r2.4 f.c
Note the order of the arguments, and that f.c will be
Purdue University, West Lafayette, IN, 47907.
.VL $Date: 89/05/02 11:18:34 $
Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
ci(1L), co(1L), merge(1L), ident(1L), rcs(1L), rcsdiff(1L), rlog(1L), rcsfile(5L),
Walter F. Tichy, "Design, Implementation, and Evaluation of a Revision Control
System," in \fIProceedings of the 6th International Conference on Software
Engineering\fR, IEEE, Tokyo, Sept. 1982.
\fIRcsmerge\fR does not work on
files that contain lines with a single `.'.