Login or Register to Ask a Question and Join Our Community

Linux and UNIX Man Pages

Linux & Unix Commands - Search Man Pages

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)

Check Out this Related Man Page

rcsdiff(1)																rcsdiff(1)

NAME

       rcsdiff - compare RCS revisions

SYNOPSIS

       rcsdiff [-ksubst] [-q] [-rrev1 [-rrev2]] [-Vn] [-xsuffixes] [diff options] file...

DESCRIPTION

       rcsdiff runs diff(1) to compare two revisions of each RCS file given.

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

       The  option  -q suppresses diagnostic output. Zero, one, or two revisions may be specified with -r. The option -ksubst affects keyword sub-
       stitution when extracting revisions, as described in co(1); for example, -kk -r1.1 -r1.2 ignores differences in keyword values when compar-
       ing  revisions  1.1  and 1.2.  To avoid excess output from locker name substitution, -kkvl is assumed if (1) at most one revision option is
       given, (2) no -k option is given, (3) -kkv is the default keyword substitution, and (4) the working file's mode would be produced by co -l.
       See  co(1)  for details about -V and -x.  Otherwise, all options of diff(1) that apply to regular files are accepted, with the same meaning
       as for diff.

       If both rev1 and rev2 are omitted, rcsdiff compares the latest revision on the default branch (by default the trunk) with the  contents	of
       the corresponding working file.	This is useful for determining what you changed since the last checkin.

       If rev1 is given, but rev2 is omitted, rcsdiff compares revision rev1 of the RCS file with the contents of the corresponding working file.

       If both rev1 and rev2 are given, rcsdiff compares revisions rev1 and rev2 of the RCS file.

       Both rev1 and rev2 may be given numerically or symbolically.

EXAMPLES

       The command rcsdiff  f.c

       compares the latest revision on the default branch of the RCS file to the contents of the working file f.c.

ENVIRONMENT

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

DIAGNOSTICS

       Exit status is 0 for no differences during any comparison, 1 for some differences, 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), diff(1), ident(1), rcs(1), rcsintro(1), rcsmerge(1), rlog(1)

       Walter F. Tichy, RCS--A System for Version Control, Software--Practice & Experience 15, 7 (July 1985), 637-654.

																	rcsdiff(1)
Man Page