Penguin
Recent Changes
Annotated edit history of rcsmerge(1) version 2, including all changes. View license author blame.
Rev Author # Line
1 perry 1 RCSMERGE
2 !!!RCSMERGE
3 NAME
4 SYNOPSIS
5 DESCRIPTION
6 OPTIONS
7 EXAMPLES
8 ENVIRONMENT
9 DIAGNOSTICS
10 IDENTIFICATION
11 SEE ALSO
12 ----
13 !!NAME
14
15
16 rcsmerge - merge RCS revisions
17 !!SYNOPSIS
18
19
20 __rcsmerge__ [[''options''] ''file''
21 !!DESCRIPTION
22
23
24 __rcsmerge__ incorporates the changes between two
25 revisions of an RCS file into the
26 corresponding working file.
27
28
29 Pathnames matching an RCS suffix denote
30 RCS files; all others denote working files.
31 Names are paired as explained in ci(1).
32
33
34 At least one revision must be specified with one of the
35 options described below, usually __-r__. At most two
36 revisions may be specified. If only one revision is
37 specified, the latest revision on the default branch
38 (normally the highest branch on the trunk) is assumed for
39 the second revision. Revisions may be specified numerically
40 or symbolically.
41
42
43 __rcsmerge__ prints a warning if there are overlaps, and
44 delimits the overlapping regions as explained in
45 merge(1). The command is useful for incorporating
46 changes into a checked-out revision.
47 !!OPTIONS
48
49
50 __-A__
51
52
53 Output conflicts using the __-A__ style of
2 perry 54 diff3(1), if supported by __diff3__. This merges
1 perry 55 all changes leading from ''file2'' to ''file3'' into
56 ''file1'', and generates the most verbose
57 output.
58
59
60 __-E__, __-e__
61
62
63 These options specify conflict styles that generate less
2 perry 64 information than __-A__. See diff3(1) for details.
1 perry 65 The default is __-E__. With __-e__, __rcsmerge__
66 does not warn about conflicts.
67
68
69 __-k__''subst''
70
71
72 Use ''subst'' style keyword substitution. See
73 co(1) for details. For example, __-kk -r1.1
74 -r1.2__ ignores differences in keyword values when merging
75 the changes from __1.1__ to __1.2__. It normally does
76 not make sense to merge binary files as if they were text,
77 so __rcsmerge__ refuses to merge files if __-kb__
78 expansion is used.
79
80
81 __-p__[[''rev'']
82
83
84 Send the result to standard output instead of overwriting
85 the working file.
86
87
88 __-q__[[''rev'']
89
90
91 Run quietly; do not print diagnostics.
92
93
94 __-r__[[''rev'']
95
96
97 Merge with respect to revision ''rev''. Here an empty
98 ''rev'' stands for the latest revision on the default
99 branch, normally the head.
100
101
102 __-T__
103
104
105 This option has no effect; it is present for compatibility
106 with other RCS commands.
107
108
109 __-V__
110
111
112 Print RCS 's version number.
113
114
115 __-V__''n''
116
117
118 Emulate RCS version ''n''. See
119 co(1) for details.
120
121
122 __-x__''suffixes''
123
124
125 Use ''suffixes'' to characterize RCS
126 files. See ci(1) for details.
127
128
129 __-z__''zone''
130
131
132 Use ''zone'' as the time zone for keyword substitution.
133 See co(1) for details.
134 !!EXAMPLES
135
136
137 Suppose you have released revision 2.8 of __f.c__. Assume
138 furthermore that after you complete an unreleased revision
139 3.4, you receive updates to release 2.8 from someone else.
140 To combine the updates to 2.8 and your changes between 2.8
141 and 3.4, put the updates to 2.8 into file f.c and
142 execute
143
144
145 __rcsmerge -p -r2.8 -r3.4 f.c
146 __
147
148
149 Then examine __f.merged.c__. Alternatively, if you want
150 to save the updates to 2.8 in the RCS file,
151 check them in as revision 2.8.1.1 and execute __co
152 -j__:
153
154
155 __ci -r2.8.1.1 f.c
156 co -r3.4 -j2.8:2.8.1.1 f.c__
157
158
159 As another example, the following command undoes the changes
160 between revision 2.4 and 2.8 in your currently checked out
161 revision in __f.c__.
162
163
164 __rcsmerge -r2.8 -r2.4 f.c__
165
166
167 Note the order of the arguments, and that __f.c__ will be
168 overwritten.
169 !!ENVIRONMENT
170
171
172 __RCSINIT__
173
174
175 options prepended to the argument list, separated by spaces.
176 See ci(1) for details.
177 !!DIAGNOSTICS
178
179
180 Exit status is 0 for no overlaps, 1 for some overlaps, 2 for
181 trouble.
182 !!IDENTIFICATION
183
184
185 Author: Walter F. Tichy.
186 Manual Page Revision: 5.6; Release Date: 1995/06/01.
187 Copyright 1982, 1988, 1989 Walter F. Tichy.
188 Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul
189 Eggert.
190 !!SEE ALSO
191
192
193 ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1),
194 rcsintro(1), rlog(1), rcsfile(5)
195 Walter F. Tichy, RCS --A System for Version
196 Control, ''Software--Practice ''
197 __15__, 7 (July 1985), 637-654.
198 ----
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.