

RCSMERGE(1)                Unix Programmer's Manual                RCSMERGE(1)


NNNAAAMMMEEE
     rcsmerge - merge RCS revisions

SSSYYYNNNOOOPPPSSSIIISSS
     rrrcccsssmmmeeerrrgggeee [_o_p_t_i_o_n_s] _f_i_l_e

DDDEEESSSCCCRRRIIIPPPTTTIIIOOONNN
     rrrcccsssmmmeeerrrgggeee incorporates the changes between two revisions of  an  RCS  file
     into the corresponding working file.

     A file name ending in ,,,vvv is an RCS file name, otherwise  a  working  file
     name.   rrrcccsssmmmeeerrrgggeee derives the working file name from the RCS file name and
     vice versa, as explained in cccooo(1).  A pair consisting of both an RCS  and
     a working file name may also be specified.

     At least one revision must be specified with one of the options described
     below,  usually ---rrr.  At most two revisions may be specified.  If only one
     revision is specified, the latest is omitted, 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
     symbolically.

     rrrcccsssmmmeeerrrgggeee prints a  warning  if  there  are  overlaps,  and  delimits  the
     overlapping  regions  as  explained in cccooo\\\ ---jjj.  The command is useful for
     incorporating changes into a checked-out revision.

OOOPPPTTTIIIOOONNNSSS

     ---kkk_s_u_b_s_t
          Use _s_u_b_s_t style keyword substitution.  See cccooo(1) for  details.   For
          example,  ---kkkkkk\\\  ---rrr111...111\\\  ---rrr111...222  ignores differences in keyword values
          when merging the changes from 111...111 to 111...222.

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

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

     ---rrr[rev]]]
          Merge with respect to revision _r_e_v.

     ---VVV_n  Emulate RCS version _n.  See cccooo(1) for details.

EEEXXXAAAMMMPPPLLLEEESSS
     Suppose you have released revision 2.8 of fff...ccc.  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

         rrrcccsssmmmeeerrrgggeee  ---ppp  ---rrr222...888  ---rrr333...444  fff...ccc  >>>fff...mmmeeerrrgggeeeddd...ccc





                                    \*(Dt                                    1



RCSMERGE(1)                Unix Programmer's Manual                RCSMERGE(1)


     Then examine fff...mmmeeerrrgggeeeddd...cc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 cccooo
     ---jjj:

         ccciii  ---rrr222...888...111...111  fff...ccc
         cccooo  ---rrr333...444  ---jjj222...888:::222...888...111...111  fff...cc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ff...ccc.

         rrrcccsssmmmeeerrrgggeee  ---rrr222...888  ---rrr222...444  fff...ccc

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

DDDIIIAAAGGGNNNOOOSSSTTTIIICCCSSS
     Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble.

IIIDDDEEENNNTTTIIIFFFIIICCCAAATTTIIIOOONNN
     Author: Walter F. Tichy.
     Revision Number: 5.1; Release Date: 1990/08/29.
     Copyright (c) 1982, 1988, 1989 by Walter F. Tichy.
     Copyright (c) 1990 by Paul Eggert.

SSSEEEEEE AAALLLSSSOOO
     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, _S_o_f_t_w_a_r_e--_P_r_a_c_t_i_c_e  &
     _E_x_p_e_r_i_e_n_c_e 111555, 7 (July 1985), 637-654.






























                                    \*(Dt                                    2

