projects / unix-history / blame
| Commit | Line | Data |
|---|---|---|
| acec9572 WJ |
1 | .TH RCSMERGE 1L "" "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 standard 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 | |
| 16 | .IR co (1L). | |
| 17 | A pair consisting | |
| 18 | of both an RCS and a working file name may also be specified. | |
| 19 | .PP | |
| 20 | \fIRev1\fR may not be omitted. If \fIrev2\fR is omitted, the latest | |
| 21 | revision on the default branch (normally the highest branch on the trunk) | |
| 22 | is assumed. | |
| 23 | Both \fIrev1\fR and \fIrev2\fR may be given numerically or symbolically. | |
| 24 | .PP | |
| 25 | \fIRcsmerge\fR prints a warning if there are overlaps, and delimits | |
| 26 | the overlapping regions as explained in \fIco \-j\fR. | |
| 27 | The command is useful for incorporating changes into a checked-out revision. | |
| 28 | .SH EXAMPLES | |
| 29 | Suppose you have released revision 2.8 of f.c. Assume | |
| 30 | furthermore that you just completed revision 3.4, when you receive | |
| 31 | updates to release 2.8 from someone else. | |
| 32 | To combine the updates to 2.8 and your changes between 2.8 and 3.4, | |
| 33 | put the updates to 2.8 into file f.c and execute | |
| 34 | .sp | |
| 35 | .B " rcsmerge \-p \-r2.8 \-r3.4 f.c >f.merged.c | |
| 36 | .sp | |
| 37 | Then examine f.merged.c. | |
| 38 | Alternatively, if you want to save the updates to 2.8 in the RCS file, | |
| 39 | check them in as revision 2.8.1.1 and execute \fIco \-j\fR: | |
| 40 | .sp | |
| 41 | .B " ci \-r2.8.1.1 f.c | |
| 42 | .br | |
| 43 | .B " co \-r3.4 \-j2.8:2.8.1.1 f.c | |
| 44 | .sp | |
| 45 | As another example, the following command undoes the changes | |
| 46 | between revision 2.4 and 2.8 in your currently checked out revision | |
| 47 | in f.c. | |
| 48 | .sp | |
| 49 | .B " rcsmerge \-r2.8 \-r2.4 f.c | |
| 50 | .sp | |
| 51 | Note the order of the arguments, and that f.c will be | |
| 52 | overwritten. | |
| 53 | .SH IDENTIFICATION | |
| 54 | .de VL | |
| 55 | \\$2 | |
| 56 | .. | |
| 57 | Author: Walter F. Tichy, | |
| 58 | Purdue University, West Lafayette, IN, 47907. | |
| 59 | .sp 0 | |
| 60 | Revision Number: | |
| 61 | .VL $Revision: 1.2 $ | |
| 62 | ; Release Date: | |
| 63 | .VL $Date: 89/05/02 11:18:34 $ | |
| 64 | \&. | |
| 65 | .sp 0 | |
| 66 | Copyright \(co 1982, 1988, 1989 by Walter F. Tichy. | |
| 67 | .SH SEE ALSO | |
| 68 | ci(1L), co(1L), merge(1L), ident(1L), rcs(1L), rcsdiff(1L), rlog(1L), rcsfile(5L), | |
| 69 | .br | |
| 70 | Walter F. Tichy, "Design, Implementation, and Evaluation of a Revision Control | |
| 71 | System," in \fIProceedings of the 6th International Conference on Software | |
| 72 | Engineering\fR, IEEE, Tokyo, Sept. 1982. | |
| 73 | .SH BUGS | |
| 74 | \fIRcsmerge\fR does not work on | |
| 75 | files that contain lines with a single `.'. |