Category : Miscellaneous Language Source Code
Archive   : RCS56DOS.ZIP
Filename : RCSMERGE.MAN

RCSMERGE(1) RCSMERGE(1)


NNAAMMEE
rcsmerge - merge RCS revisions

SSYYNNOOPPSSIISS
rrccssmmeerrggee [_o_p_t_i_o_n_s] _f_i_l_e

DDEESSCCRRIIPPTTIIOONN
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 symbolically.

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

OOPPTTIIOONNSS
--kk_s_u_b_s_t
Use _s_u_b_s_t style keyword substitution. See ccoo(1)
for details. For example, --kkkk --rr11..11 --rr11..22 ignores
differences in keyword values when merging the
changes from 11..11 to 11..22.

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

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

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

--VV Print s version number.

--VV_n Emulate RCS version _n. See ccoo(1) for details.

--xx_s_u_f_f_i_x_e_s
Use _s_u_f_f_i_x_e_s to characterize RCS files. See ccii(1)
for details.




GNU 1992/07/28 1





RCSMERGE(1) RCSMERGE(1)


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.

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

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

IIDDEENNTTIIFFIICCAATTIIOONN
Author: Walter F. Tichy.
Revision Number: 5.4; Release Date: 1992/07/28.
Copyright 1982, 1988, 1989 by Walter F. Tichy.
Copyright 1990, 1991, 1992 by Paul Eggert.

SSEEEE AALLSSOO
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 1155, 7 (July 1985),
637-654.











GNU 1992/07/28 2