rcsmerge 命令

常用示例

说明

rcsmerge performs a three-way merge of RCS file revisions, incorporating changes made between two specified revisions into the current working file. It identifies a common ancestor revision and applies the differences to produce a merged result, similar to how modern version control systems handle branch merging. By default the merge modifies the working file in place, but the -p flag prints the merged result to stdout instead. When conflicting changes are detected, conflict markers are inserted into the output and must be resolved manually before the file can be checked back in.

参数

-r _REV_

Revision to merge. An empty rev stands for the latest revision on the default branch.

-p

Send result to stdout instead of overwriting the working file.

-q

Quiet mode; do not print diagnostics.

-A

Output conflicts using the -A style of diff3(1).

-E

Output conflicts using the -E style of diff3(1) (default).

-e

Output conflicts using the -e style of diff3(1). Does not warn about conflicts.

-k _SUBST_

Keyword substitution mode (e.g., -kk ignores keyword value differences).

-V _N_

RCS version emulation.