MPE/iX Shell and Utilities Reference Manual, Vol 2

rcsmerge(1) MPE/iX Shell and Utilities rcsmerge(1)
EXAMPLES
Suppose you have released revision 2.8 of f.c. Also, assume that you have just finished revi-
sion 3.4 when you receive updates to 2.8 from someone else. To combine the updates to 2.8
and your changes between 2.8 and 3.4, put the updated 2.8 into file f.c and run
rcsmerge -p -r2.8 -r3.4 f.c >f_merged.c
If there were any overlaps reported you will want to examine f_merged.c. Alternatively, if
you want to save the updates to 2.8 in the
RCS file, check in the updated file 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.8 and 3.4
in your currently checked-out revision in f.c.
rcsmerge -r3.4 -r2.8 f.c
Note the order of the arguments, and that f.c is overwritten.
DIAGNOSTICS
Possible exit status values are:
0 Successful completion.
1 An error occurred.
Messages
Message: Can’t open filename: system error
Cause: See syserror(3).
Action: See syserror(3).
Message: can’t use rcsmerge on binary file filename
Cause: You attempted to use rcsmerge on the binary file filename. rcsmerge only
supports merging revisions of text files.
Action: No action is possible.
Message: co failed: system error
Cause: See syserror(3).
Action: See syserror(3).
Message: merge failed: system error
Cause: See syserror(3).
Action: See syserror(3).
Commands and Utilities 1-475