9 .TH RCSMERGE 1 \*(Dt GNU
11 rcsmerge \- merge RCS revisions
14 .RI [ options ] " file"
17 incorporates the changes between two revisions
18 of an \*r file into the corresponding working file.
20 Pathnames matching an \*r suffix denote \*r files;
21 all others denote working files.
22 Names are paired as explained in
25 At least one revision must be specified with one of the options
26 described below, usually
28 At most two revisions may be specified.
29 If only one revision is specified, the latest
30 revision on the default branch (normally the highest branch on the trunk)
31 is assumed for the second revision.
32 Revisions may be specified numerically or symbolically.
35 prints a warning if there are overlaps, and delimits
36 the overlapping regions as explained in
38 The command is useful for incorporating changes into a checked-out revision.
42 Output conflicts using the
48 This merges all changes leading from
54 and generates the most verbose output.
57 These options specify conflict styles that generate less information
68 does not warn about conflicts.
73 style keyword substitution.
78 .B "\-kk\ \-r1.1\ \-r1.2"
79 ignores differences in keyword values when merging the changes from
83 It normally does not make sense to merge binary files as if they were text, so
85 refuses to merge files if
90 Send the result to standard output instead of overwriting the working file.
93 Run quietly; do not print diagnostics.
96 Merge with respect to revision
100 stands for the latest revision on the default branch, normally the head.
103 This option has no effect;
104 it is present for compatibility with other \*r commands.
107 Print \*r's version number.
119 to characterize \*r files.
127 as the time zone for keyword substitution.
132 Suppose you have released revision 2.8 of
135 furthermore that after you complete an unreleased revision 3.4, you receive
136 updates to release 2.8 from someone else.
137 To combine the updates to 2.8 and your changes between 2.8 and 3.4,
138 put the updates to 2.8 into file f.c and execute
140 .B " rcsmerge \-p \-r2.8 \-r3.4 f.c >f.merged.c"
144 Alternatively, if you want to save the updates to 2.8 in the \*r file,
145 check them in as revision 2.8.1.1 and execute
148 .B " ci \-r2.8.1.1 f.c"
150 .B " co \-r3.4 \-j2.8:2.8.1.1 f.c"
152 As another example, the following command undoes the changes
153 between revision 2.4 and 2.8 in your currently checked out revision
157 .B " rcsmerge \-r2.8 \-r2.4 f.c"
159 Note the order of the arguments, and that
166 options prepended to the argument list, separated by spaces.
171 Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.
173 Author: Walter F. Tichy.
175 Manual Page Revision: \*(Rv; Release Date: \*(Dt.
177 Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
179 Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
181 ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1), rlog(1),
185 \*r\*-A System for Version Control,
186 .I "Software\*-Practice & Experience"
188 7 (July 1985), 637-654.