因此,修改文档后,在次更新并选中“Reset any sticky date/tag/-k”options选项,会有如下提示信息:
RCS file: /sport/AF14R/CF/11.txt,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into 11.txt
M 11.txt
***** CVS exited normally with code 0 *****
以上信息是告诉您合并了两个不同版本的信息。
接着执行提交操作,就能够了
假如您不作任何修改,强制提交(选中Force commint(even if not modifed)),如下错误信息
cvs server: sticky tag `1.3’ for file `11.txt’ is not a branch
cvs [server aborted]: correct above errors first!