MPE/iX Shell and Utilities Reference Manual, Vol 2

rcsmerge(1) MPE/iX Shell and Utilities rcsmerge(1)
NAME
rcsmerge — merge RCS revisions
SYNOPSIS
rcsmerge [–h][–O][–p][–q] –rrev1 [–rrev2][–Yfile] file
DESCRIPTION
Note: The
MPE/iX implementation of this utility does not function exactly as this man page
describes. For details, see the MPE/iX NOTES section at the end of this man page.
rcsmerge incorporates the changes between rev1 and rev2 of an RCS file into the corre-
sponding working file. By default, the result overwrites the working file.
The file may be either an RCS file or a working file.
rcsmerge displays 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.
Options
rcsmerge accepts the following options:
–h forces diff to use the –h option when called by rcsmerge. This saves time if you
know that the file is large enough to require the –h option.
–O ignores default options found in the configuration file.
–p sends the result to standard output, rather than overwriting the working file.
–q quiet mode; suppresses diagnostics.
–rrev1
–rrev2 specifies two revisions. The changes needed to make rev1 into rev2 are incorporated
into the working file.
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.
–Yfile specifies file as the local configuration file.
1-474 Commands and Utilities