Return to rcsmerge.1 CVS log

Up to [CSRG BSD Unix] / 43BSD / contrib / rcs / man

Annotation of 43BSD/contrib/rcs/man/rcsmerge.1, revision 1.1.1.1

1.1       root        1: .TH RCSMERGE 1 6/29/83 "Purdue University"
                      2: .SH NAME
                      3: rcsmerge \- merge RCS revisions
                      4: .SH SYNOPSIS
                      5: \fBrcsmerge\fR \fB-r\fIrev1\fR [ \fB-r\fIrev2\fR ] [ \fB-p\fR ] file
                      6: .SH DESCRIPTION
                      7: .I Rcsmerge
                      8: incorporates the changes between \fIrev1\fR and \fIrev2\fR of an
                      9: RCS file into the corresponding working file. If \fB-p\fR is given, the result
                     10: is printed on the std. output, otherwise the result overwrites the
                     11: working file.
                     12: .PP
                     13: A file name ending in ',v' is an RCS file name, otherwise a
                     14: working file name. \fIMerge\fR derives the working file name from the RCS
                     15: file name and vice versa, as explained in \fIco\fR (1). A pair consisting
                     16: of both an RCS and a working file name may also be specified.
                     17: .PP
                     18: \fIRev1\fR may not be omitted. If \fIrev2\fR is omitted, the latest
                     19: revision on the trunk is assumed.
                     20: Both \fIrev1\fR and \fIrev2\fR may be given numerically or symbolically.
                     21: .PP
                     22: \fIRcsmerge\fR prints a warning if there are overlaps, and delimits
                     23: the overlapping regions as explained in \fIco -j\fR.
                     24: The command is useful for incorporating changes into a checked-out revision.
                     25: .SH EXAMPLES
                     26: Suppose you have released revision 2.8 of f.c. Assume
                     27: furthermore that you just completed revision 3.4, when you receive
                     28: updates to release 2.8 from someone else.
                     29: To combine the updates to 2.8 and your changes between 2.8 and 3.4,
                     30: put the updates to 2.8 into file f.c and execute
                     31: .sp
                     32:         rcsmerge  -p  -r2.8  -r3.4  f.c  >f.merged.c
                     33: .sp
                     34: Then examine f.merged.c.
                     35: Alternatively, if you want to save the updates to 2.8 in the RCS file,
                     36: check them in as revision 2.8.1.1 and execute \fIco -j\fR:
                     37: .sp
                     38:         ci  -r2.8.1.1  f.c
                     39:         co  -r3.4  -j2.8:2.8.1.1  f.c
                     40: .sp
                     41: As another example, the following command undoes the changes
                     42: between revision 2.4 and 2.8 in your currently checked out revision
                     43: in f.c.
                     44: .sp
                     45:         rcsmerge  -r2.8  -r2.4  f.c
                     46: .sp
                     47: Note the order of the arguments, and that f.c will be
                     48: overwritten.
                     49: .SH IDENTIFICATION
                     50: .de VL
                     51: \\$2
                     52: ..
                     53: Author: Walter F. Tichy,
                     54: Purdue University, West Lafayette, IN, 47907.
                     55: .sp 0
                     56: Revision Number:
                     57: .VL $Revision: 3.0 $
                     58: ; Release Date:
                     59: .VL $Date: 83/01/15 18:55:16 $
                     60: \&.
                     61: .sp 0
                     62: Copyright \(co 1982 by Walter F. Tichy.
                     63: .SH SEE ALSO
                     64: ci (1), co (1), merge (1), ident (1), rcs (1), rcsdiff (1), rlog (1), rcsfile (5).
                     65: .sp 0
                     66: Walter F. Tichy, "Design, Implementation, and Evaluation of a Revision Control
                     67: System," in \fIProceedings of the 6th International Conference on Software
                     68: Engineering\fR, IEEE, Tokyo, Sept. 1982.
                     69: .SH BUGS
                     70: \fIRcsmerge\fR does not work for
                     71: files that contain lines with a single `.'.

This archive runs on limited infrastructure. Preserving old code on modern bandwidth. Automated agents are requested to crawl responsibly.