rcsmerge(1)                                           rcsmerge(1)



NAME
     rcsmerge - merges two versions of an RCS file

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

ARGUMENTS
     file Specifies the RCS file whose versions are to be merged.

     -p   Prints the results of the merge on the standard output;
          otherwise the results overwrite the working file.

     -rrev1
          Specifies the first revision of the file to be merged.
          This argument cannot be omitted.

     -rrev2
          Specifies the next revision of the file to be merged.
          If this argument is omitted, the latest revision on the
          trunk is assumed.

DESCRIPTION
     rcsmerge incorporates the changes between rev1 and rev2 of
     an RCS file into the corresponding working file.

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

     Both rev1 and rev2 may be given numerically or symbolically.

     The rcsmerge program 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 revision.

EXAMPLES
     Suppose you have released revision 2.8 of f.c.  Assume
     further that you just completed revision 3.4, when you
     receive 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
     revision 2.8.1.1 and execute co -j:




January 1992                                                    1

rcsmerge(1)                                           rcsmerge(1)



        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.

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

NOTES
     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) in A/UX Programmer's Reference

     Walter F. Tichy, ``Design, Implementation, and Evaluation of
     a Revision Control System,'' in Proceedings of the 6th
     International Conference on Software Engineering, IEEE,
     Tokyo, Sept. 1982























2                                                    January 1992