rcsmerge(1l) [bsd man page]

RCSMERGE(1L)															      RCSMERGE(1L)

NAME

       rcsmerge - merge RCS revisions

SYNOPSIS

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

DESCRIPTION

       Rcsmerge  incorporates  the changes between rev1 and rev2 of an RCS file into the corresponding working file. If -p is given, the result is
       printed on the standard output, otherwise the result overwrites the working file.

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

       Rev1  may  not  be  omitted.  If  rev2  is omitted, the latest revision on the default branch (normally the highest branch on the trunk) is
       assumed.  Both rev1 and rev2 may be given numerically or symbolically.

       Rcsmerge 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 furthermore 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  exe-
       cute

	       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 exe-
       cute co -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.

IDENTIFICATION

       Author: Walter F. Tichy, Purdue University, West Lafayette, IN, 47907.
       Revision Number: 1.2 ; Release Date: 87/02/27 .
       Copyright (C) 1982 by Walter F. Tichy.

SEE ALSO

       ci(1L), co(1L), merge(1L), ident(1L), rcs(1L), rcsdiff(1L), rlog(1L)
       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.

BUGS

       Rcsmerge does not work on files that contain lines with a single `.'.

Purdue University														      RCSMERGE(1L)

rcsmerge(1)															       rcsmerge(1)

NAME

       rcsmerge - merge RCS revisions

SYNOPSIS

       rcsmerge [options] file

OPTIONS

       Use subst style keyword substitution.  See co(1) for details. For example, -kk -r1.1 -r1.2 ignores differences in keyword values when merg-
       ing the changes from 1.1 to 1.2.  Send the result to standard output instead of overwriting the working file.  Run quietly;  do	not  print
       diagnostics.   Merge  with  respect  to revision rev.  Here an empty rev stands for the latest revision on the default branch, normally the
       head.  Emulate RCS version n. See co(1) for details.  Use suffixes to characterize RCS files. See ci(1) for details.

DESCRIPTION

       rcsmerge 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 ci(1).

       At least one revision must be specified with one of the options described below, usually -r. 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.

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

EXAMPLES

       Suppose	you have released revision 2.8 of f.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 rcsmerge -p -r2.8 -r3.4f.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 exe-
       cute co -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.

ENVIRONMENT

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

DIAGNOSTICS

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

IDENTIFICATION

       Author: Walter F. Tichy.
       Revision Number: 1.1.6.2; Release Date: 1993/10/07.
       Copyright (C) 1982, 1988, 1989 by Walter F. Tichy.
       Copyright (C) 1990, 1991 by 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 15, 7 (July 1985), 637-654.

																       rcsmerge(1)