RCSMERGE(1) RCSMERGE(1)

NAME
       rcsmerge - merge RCS revisions

SYNOPSIS
       rrccssmmeerrggee [options] file

DESCRIPTION
       rrccssmmeerrggee  incorporates the changes between two revisions of an RCS file
       into the corresponding working file.

       Pathnames matching an RCS suffix denote RCS files;  all  others  denote
       working files.  Names are paired as explained in ccii(1).

       At  least  one  revision  must  be  specified  with  one of the options
       described below, usually -rr.  At most two revisions may  be  specified.
       If  only  one revision is specified, the latest revision on the default
       branch (normally the highest branch on the trunk) is  assumed  for  the
       second  revision.   Revisions  may be specified numerically or symboli-
       cally.

       rrccssmmeerrggee prints a warning if there are overlaps, and delimits the over-
       lapping  regions  as  explained in mmeerrggee(1).  The command is useful for
       incorporating changes into a checked-out revision.

OOPPTTIIOONNSS
       -AA     Output conflicts using the -AA style of ddiiffff33(1), if supported by
              ddiiffff33.  This merges all changes leading from file2 to file3 into
              file1, and generates the most verbose output.

       -EE, -ee These options specify conflict styles that generate less  infor-
              mation  than  -AA.  See ddiiffff33(1) for details.  The default is -EE.
              With -ee, rrccssmmeerrggee does not warn about conflicts.

       -kksubst
              Use subst style keyword substitution.  See  ccoo(1)  for  details.
              For example, -kkkk -rr11..11 -rr11..22 ignores differences in keyword val-
              ues when merging the changes from 11..11 to 11..22.  It normally  does
              not  make  sense  to merge binary files as if they were text, so
              rrccssmmeerrggee refuses to merge files if -kkbb expansion is used.

       -pp[rev]
              Send the result to standard output instead  of  overwriting  the
              working file.

       -qq[rev]
              Run quietly; do not print diagnostics.

       -rr[rev]
              Merge  with  respect  to revision rev.  Here an empty rev stands
              for the latest revision on  the  default  branch,  normally  the
              head.

       -TT     This  option has no effect; it is present for compatibility with
              other RCS commands.

       -VV     Print RCS's version number.

       -VVn    Emulate RCS version n.  See ccoo(1) for details.

       -xxsuffixes
              Use suffixes to characterize RCS files.  See ccii(1) for  details.

       -zzzone Use  zone  as the time zone for keyword substitution.  See ccoo(1)
              for details.

EEXXAAMMPPLLEESS
       Suppose you have released revision 2.8 of ff..cc.  Assume furthermore that
       after  you  complete an unreleased revision 3.4, 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

           rrccssmmeerrggee  -pp  -rr22..88  -rr33..44  ff..cc  >>ff..mmeerrggeedd..cc

       Then examine ff..mmeerrggeedd..cc.   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 ccoo -jj:

           ccii  -rr22..88..11..11  ff..cc
           ccoo  -rr33..44  -jj22..88::22..88..11..11  ff..cc

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

           rrccssmmeerrggee  -rr22..88  -rr22..44  ff..cc

       Note the order of the arguments, and that ff..cc will be overwritten.

ENVIRONMENT       RRCCSSIINNIITT
              options  prepended  to  the  argument list, separated by spaces.
              See ccii(1) for details.

DIAGNOSTICS       Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.

IIDDEENNTTIIFFIICCAATTIIOONN
       Author: Walter F. Tichy.
       Manual Page Revision: 1.1; Release Date: 1999/04/23.
       Copyright (C) 1982, 1988, 1989 Walter F. Tichy.
       Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.

SEE ALSO
       ci(1), co(1),  ident(1),  merge(1),  rcs(1),  rcsdiff(1),  rcsintro(1),
       rlog(1), rcsfile(5)
       Walter  F. Tichy, RCS-A System for Version Control, Software-Practice
       & Experience 1155, 7 (July 1985), 637-654.



GNU                               1999/04/23                       RCSMERGE(1)