1RCSMERGE(1) General Commands Manual RCSMERGE(1)
2
6 rcsmerge - merge RCS revisions
7
9 rcsmerge [options] file
10
12 rcsmerge incorporates the changes between two revisions of an RCS file
13 into the corresponding working file.
14 Pathnames matching an RCS suffix denote RCS files; all others denote
16 working files. Names are paired as explained in ci(1).
17 At least one revision must be specified with one of the options
19 described below, usually -r. At most two revisions may be specified.
20 If only one revision is specified, the latest revision on the default
21 branch (normally the highest branch on the trunk) is assumed for the
22 second revision. Revisions may be specified numerically or symboli‐
23 cally.
24 rcsmerge prints a warning if there are overlaps, and delimits the over‐
26 lapping regions as explained in merge(1). The command is useful for
27 incorporating changes into a checked-out revision.
28
30 -A Output conflicts using the -A style of diff3(1), if supported by
31 diff3. This merges all changes leading from file2 to file3 into
32 file1, and generates the most verbose output.
33 -E, -e These options specify conflict styles that generate less infor‐
35 mation than -A. See diff3(1) for details. The default is -E.
36 With -e, rcsmerge does not warn about conflicts.
37 -ksubst
39 Use subst style keyword substitution. See co(1) for details.
40 For example, -kk -r1.1 -r1.2 ignores differences in keyword val‐
41 ues when merging the changes from 1.1 to 1.2. It normally does
42 not make sense to merge binary files as if they were text, so
43 rcsmerge refuses to merge files if -kb expansion is used.
44 -p[rev]
46 Send the result to standard output instead of overwriting the
47 working file.
48 -q[rev]
50 Run quietly; do not print diagnostics.
51 -r[rev]
53 Merge with respect to revision rev. Here an empty rev stands
54 for the latest revision on the default branch, normally the
55 head.
56 -T This option has no effect; it is present for compatibility with
58 other RCS commands.
59 -V Print RCS's version number.
61 -Vn Emulate RCS version n. See co(1) for details.
63 -xsuffixes
65 Use suffixes to characterize RCS files. See ci(1) for details.
66 -zzone Use zone as the time zone for keyword substitution. See co(1)
68 for details.
69
71 Suppose you have released revision 2.8 of f.c. Assume furthermore that
72 after you complete an unreleased revision 3.4, you receive updates to
73 release 2.8 from someone else. To combine the updates to 2.8 and your
74 changes between 2.8 and 3.4, put the updates to 2.8 into file f.c and
75 execute
76 rcsmerge -p -r2.8 -r3.4 f.c >f.merged.c
78 Then examine f.merged.c. Alternatively, if you want to save the
80 updates to 2.8 in the RCS file, check them in as revision 2.8.1.1 and
81 execute co -j:
82 ci -r2.8.1.1 f.c
84 co -r3.4 -j2.8:2.8.1.1 f.c
85 As another example, the following command undoes the changes between
87 revision 2.4 and 2.8 in your currently checked out revision in f.c.
88 rcsmerge -r2.8 -r2.4 f.c
90 Note the order of the arguments, and that f.c will be overwritten.
92
94 RCSINIT
95 options prepended to the argument list, separated by spaces.
96 See ci(1) for details.
97
99 Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.
100
102 Author: Walter F. Tichy.
103 Manual Page Revision: 5.6; Release Date: 1995/06/01.
104 Copyright © 1982, 1988, 1989 Walter F. Tichy.
105 Copyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
106
108 ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1),
109 rlog(1), rcsfile(5)
110 Walter F. Tichy, RCS--A System for Version Control, Software--Practice
111 & Experience 15, 7 (July 1985), 637-654.
112GNU 1995/06/01 RCSMERGE(1)