5 .Id $FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1,v 1.5 1999/08/27 23:36:58 peter Exp $
6 .Id $DragonFly: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1,v 1.2 2003/06/17 04:25:48 dillon Exp $
10 .TH RCSMERGE 1 \*(Dt GNU
12 rcsmerge \- merge RCS revisions
15 .RI [ options ] " file"
18 incorporates the changes between two revisions
19 of an \*r file into the corresponding working file.
21 Pathnames matching an \*r suffix denote \*r files;
22 all others denote working files.
23 Names are paired as explained in
26 At least one revision must be specified with one of the options
27 described below, usually
29 At most two revisions may be specified.
30 If only one revision is specified, the latest
31 revision on the default branch (normally the highest branch on the trunk)
32 is assumed for the second revision.
33 Revisions may be specified numerically or symbolically.
36 prints a warning if there are overlaps, and delimits
37 the overlapping regions as explained in
39 The command is useful for incorporating changes into a checked-out revision.
43 Output conflicts using the
49 This merges all changes leading from
55 and generates the most verbose output.
58 These options specify conflict styles that generate less information
69 does not warn about conflicts.
74 style keyword substitution.
79 .B "\-kk\ \-r1.1\ \-r1.2"
80 ignores differences in keyword values when merging the changes from
84 It normally does not make sense to merge binary files as if they were text, so
86 refuses to merge files if
91 Send the result to standard output instead of overwriting the working file.
94 Run quietly; do not print diagnostics.
97 Merge with respect to revision
101 stands for the latest revision on the default branch, normally the head.
104 This option has no effect;
105 it is present for compatibility with other \*r commands.
108 Print \*r's version number.
120 to characterize \*r files.
128 as the time zone for keyword substitution.
133 Suppose you have released revision 2.8 of
136 furthermore that after you complete an unreleased revision 3.4, you receive
137 updates to release 2.8 from someone else.
138 To combine the updates to 2.8 and your changes between 2.8 and 3.4,
139 put the updates to 2.8 into file f.c and execute
141 .B " rcsmerge \-p \-r2.8 \-r3.4 f.c >f.merged.c"
145 Alternatively, if you want to save the updates to 2.8 in the \*r file,
146 check them in as revision 2.8.1.1 and execute
149 .B " ci \-r2.8.1.1 f.c"
151 .B " co \-r3.4 \-j2.8:2.8.1.1 f.c"
153 As another example, the following command undoes the changes
154 between revision 2.4 and 2.8 in your currently checked out revision
158 .B " rcsmerge \-r2.8 \-r2.4 f.c"
160 Note the order of the arguments, and that
167 options prepended to the argument list, separated by spaces.
172 Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.
174 Author: Walter F. Tichy.
176 Manual Page Revision: \*(Rv; Release Date: \*(Dt.
178 Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
180 Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
182 ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1), rlog(1),
186 \*r\*-A System for Version Control,
187 .I "Software\*-Practice & Experience"
189 7 (July 1985), 637-654.