最近用Myeclipse签入CVS代码时,先同步cvs代码时,一直报错:
这个错误没有具体说明什么文件还是什么出错了。
然后我为该java项目选择先更新代码,team->update,却一直提示:
The server reported an error while performing the "cvs update" command. (took 0:40.484)
Error: XXXX: The server did not provide any additional information.
最后经过分析,发现和自己签出的代码和服务端代码有冲突的文件有关系,因为没有冲突的文件,直接签出签入是不报错的,但有冲突的文件会报错:
cvs update -l -d -P "/XXX/WebRoot/XXFILE.jsp"
C WebRoot/XXFILE.jsp
The server reported an error while performing the "cvs update" command. (took 0:00.469)
Error: XXXX: The server did not provide any additional information.
***
单独提交,也报错:
The server reported an error while performing the "cvs commit" command. (took 0:00.891)
Error: XXXX: cvs commit: Up-to-date check failed for `WebRoot/XXFILE.jsp'
Error: XXXX: cvs [commit aborted]: correct above errors first!
冲突文件不能更新不能签出,最后我没有仔细分析原因,把本地文件备份出来,再强制签出服务端代码,合并后就能成功签入代码了。