1RCSMERGE(1L)                                                      RCSMERGE(1L)
2
3
4

NAME

6       rcsmerge - merge RCS revisions
7

SYNOPSIS

9       rcsmerge -rrev1 [ -rrev2 ] [ -p ] file
10

DESCRIPTION

12       Rcsmerge  incorporates the changes between rev1 and rev2 of an RCS file
13       into the corresponding working file. If -p  is  given,  the  result  is
14       printed  on  the  standard  output, otherwise the result overwrites the
15       working file.
16
17       A file name ending in ',v' is an RCS file  name,  otherwise  a  working
18       file  name.  Merge derives the working file name from the RCS file name
19       and vice versa, as explained in co(1L).  A pair consisting of  both  an
20       RCS and a working file name may also be specified.
21
22       Rev1 may not be omitted. If rev2 is omitted, the latest revision on the
23       default branch (normally the highest branch on the trunk)  is  assumed.
24       Both rev1 and rev2 may be given numerically or symbolically.
25
26       Rcsmerge prints a warning if there are overlaps, and delimits the over‐
27       lapping regions as explained in co  -j.   The  command  is  useful  for
28       incorporating changes into a checked-out revision.
29

EXAMPLES

31       Suppose  you have released revision 2.8 of f.c. Assume furthermore that
32       you just completed revision 3.4, when you receive  updates  to  release
33       2.8  from someone else.  To combine the updates to 2.8 and your changes
34       between 2.8 and 3.4, put the updates to 2.8 into file f.c and execute
35
36               rcsmerge  -p  -r2.8  -r3.4  f.c  >f.merged.c
37
38       Then examine f.merged.c.   Alternatively,  if  you  want  to  save  the
39       updates  to  2.8 in the RCS file, check them in as revision 2.8.1.1 and
40       execute co -j:
41
42               ci  -r2.8.1.1  f.c
43               co  -r3.4  -j2.8:2.8.1.1  f.c
44
45       As another example, the following command undoes  the  changes  between
46       revision 2.4 and 2.8 in your currently checked out revision in f.c.
47
48               rcsmerge  -r2.8  -r2.4  f.c
49
50       Note the order of the arguments, and that f.c will be overwritten.
51

IDENTIFICATION

53       Author: Walter F. Tichy, Purdue University, West Lafayette, IN, 47907.
54       Revision Number: 1.2 ; Release Date: 87/02/27 .
55       Copyright © 1982 by Walter F. Tichy.
56

SEE ALSO

58       ci(1L), co(1L), merge(1L), ident(1L), rcs(1L), rcsdiff(1L), rlog(1L)
59       Walter  F. Tichy, "Design, Implementation, and Evaluation of a Revision
60       Control System," in Proceedings of the 6th International Conference  on
61       Software Engineering, IEEE, Tokyo, Sept. 1982.
62

BUGS

64       Rcsmerge does not work on files that contain lines with a single `.'.
65
66
67
68Purdue University                                                 RCSMERGE(1L)