rcsmerge(1)                                           rcsmerge(1)



     NAME
          rcsmerge - merge RCS revisions

     SYNOPSIS
          rcsmerge -rrev1 [-rrev2] [-p]  file

     DESCRIPTION
          rcsmerge incorporates the changes between rev1 and rev2 of
          an RCS file into the corresponding working file.  If -p is
          given, the result is printed on the standard output; other-
          wise the result overwrites the working file.

          A file name ending in `,v' is an RCS file name, otherwise a
          working file name.  rcsmerge derives the working file name
          from the RCS file name and vice versa, as explained in
          co(1).  A pair consisting of both an RCS and a working file
          name may also be specified.

          rev1 may not be omitted.  If rev2 is omitted, the latest re-
          vision on the trunk is assumed.  Both rev1 and rev2 may be
          given numerically or symbolically.

          rcsmerge prints a warning if there are overlaps and delimits
          the overlapping regions as explained in co -j.  The command
          is useful for incorporating changes into a checked-out revi-
          sion.

     EXAMPLES
          Suppose you have released revision 2.8 of f.c.  Assume
          further that you just completed revision 3.4, when you re-
          ceive updates to release 2.8 from someone else.  To combine
          the updates to 2.8 and your changes between 2.8 and 3.4, put
          the updates to 2.8 into file f.c and execute the command:

             rcsmerge -p -r2.8 -r3.4 f.c > f.merged.c

          Then examine f.merged.c.  Alternatively, if you want to save
          the updates to 2.8 in the RCS file, check them in as revi-
          sion 2.8.1.1 and execute co -j:

             ci -r2.8.1.1 f.c
             co -r3.4 -j2.8:2.8.1.1 f.c

          As another example, the following command undoes the changes
          between revision 2.4 and 2.8 in your currently checked out
          revision in f.c.

             rcsmerge -r2.8 -r2.4 f.c

          Note the order of the arguments and that f.c will be
          overwritten.




     April, 1990                                                     1

     rcsmerge(1)                                           rcsmerge(1)



     DISCLAIMER
          This reference manual entry describes a utility that Apple
          understands to have been released into the public domain by
          its author or authors.  Apple has included this public
          domain utility for your convenience.  Use it at your own
          discretion.  Often the source code can be obtained if addi-
          tional requirements are met, such as the purchase of a site
          license from an author or institution.

     IDENTIFICATION
          Author: Walter F. Tichy, Purdue University, West Lafayette,
          IN, 47907.
          Revision Number: 3.0; Release Date: 83/01/15.
                    c
          Copyright   1982 by Walter F. Tichy.

     SEE ALSO
          ci(1), co(1), merge(1), ident(1), rcs(1), rcsdiff(1),
          rlog(1), rcsfile(4).
          Walter F. Tichy, ``Design, Implementation, and Evaluation of
          a Revision Control System,'' in Proceedings of the 6th
          International Conference on Software Engineering, IEEE, Tok-
          yo, Sept. 1982.

     BUGS
          rcsmerge does not work for files that contain lines with a
          single `.'.





























     2                                                     April, 1990