4.3BSD-UWisc/man/catl/rcsmerge.l

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



NAME
     rcsmerge - merge RCS revisions

SYNOPSIS
     rcsmerge -r_r_e_v_1 [ -r_r_e_v_2 ] [ -p ] file

DESCRIPTION
     _R_c_s_m_e_r_g_e incorporates the changes between _r_e_v_1 and _r_e_v_2 of
     an RCS file into the corresponding working file. If -p is
     given, the result is printed on the std. output, otherwise
     the result overwrites the working file.

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

     _R_e_v_1 may not be omitted. If _r_e_v_2 is omitted, the latest
     revision on the trunk is assumed.  Both _r_e_v_1 and _r_e_v_2 may be
     given numerically or symbolically.

     _R_c_s_m_e_r_g_e prints a warning if there are overlaps, and delim-
     its the overlapping regions as explained in _c_o -_j.  The com-
     mand is useful for incorporating changes into a checked-out
     revision.

EXAMPLES
     Suppose you have released revision 2.8 of f.c. Assume furth-
     ermore that you just completed revision 3.4, when you
     receive updates to release 2.8 from someone else.  To com-
     bine 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

             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 _c_o -_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.




Printed 1/10/87              6/29/83                            1






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



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

SEE ALSO
     ci (1), co (1), merge (1), ident (1), rcs (1), rcsdiff (1),
     rlog (1), rcsfile (5).
     Walter F. Tichy, "Design, Implementation, and Evaluation of
     a Revision Control System," in _P_r_o_c_e_e_d_i_n_g_s _o_f _t_h_e _6_t_h _I_n_t_e_r_-
     _n_a_t_i_o_n_a_l _C_o_n_f_e_r_e_n_c_e _o_n _S_o_f_t_w_a_r_e _E_n_g_i_n_e_e_r_i_n_g, IEEE, Tokyo,
     Sept. 1982.

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






































Printed 1/10/87              6/29/83                            2