View Source: rcsmerge(1) - Waikato Linux Users Group

Edit PageHistory Diff Info LikePages
RCSMERGE
!!!RCSMERGE
NAME
SYNOPSIS
DESCRIPTION
OPTIONS
EXAMPLES
ENVIRONMENT
DIAGNOSTICS
IDENTIFICATION
SEE ALSO
----
!!NAME


rcsmerge - merge RCS revisions
!!SYNOPSIS


__rcsmerge__ [[''options''] ''file''
!!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.
!!OPTIONS


__-A__


Output conflicts using the __-A__ style of
diff3(1), if supported by __diff3__. This merges
all changes leading from ''file2'' to ''file3'' into
''file1'', and generates the most verbose
output.


__-E__, __-e__


These options specify conflict styles that generate less
information than __-A__. See diff3(1) for details.
The default is __-E__. With __-e__, __rcsmerge__
does not warn about conflicts.


__-k__''subst''


Use ''subst'' style keyword substitution. See
co(1) for details. For example, __-kk -r1.1
-r1.2__ ignores differences in keyword values when merging
the changes from __1.1__ to __1.2__. It normally does
not make sense to merge binary files as if they were text,
so __rcsmerge__ refuses to merge files if __-kb__
expansion is used.


__-p__[[''rev'']


Send the result to standard output instead of overwriting
the working file.


__-q__[[''rev'']


Run quietly; do not print diagnostics.


__-r__[[''rev'']


Merge with respect to revision ''rev''. Here an empty
''rev'' stands for the latest revision on the default
branch, normally the head.


__-T__


This option has no effect; it is present for compatibility
with other RCS commands.


__-V__


Print RCS 's version number.


__-V__''n''


Emulate RCS version ''n''. See
co(1) for details.


__-x__''suffixes''


Use ''suffixes'' to characterize RCS
files. See ci(1) for details.


__-z__''zone''


Use ''zone'' as the time zone for keyword substitution.
See co(1) for details.
!!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.4 f.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 execute __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


__RCSINIT__


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.
Manual Page Revision: 5.6; Release Date: 1995/06/01.
Copyright 1982, 1988, 1989 Walter F. Tichy.
Copyright 1990, 1991, 1992, 1993, 1994, 1995 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 ''
__15__, 7 (July 1985), 637-654.
----
11 pages link to rcsmerge(1):
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.
Last edited on Tuesday, June 4, 2002 12:22:49 am by "perry"
Edit PageHistory Diff Info LikePages