如何在对CVS进行更改时修复问题

Question

我正在尝试将我的更改提交到CVS存储库,但是我收到以下错误:

RCS file: /opt/CZarmen/CVS_REPOSITORY/Z_user/lib/python/StudioCustom.py,v
retrieving revision 1.38
retrieving revision 1.39
Merging differences between 1.38 and 1.39 into StudioCustom.py
M lib/python/StudioCustom.py

RCS file: /opt/CZarmen/CVS_REPOSITORY/Z_user/menu_scripts/Y/ZExtensions,v
retrieving revision 1.46
retrieving revision 1.47
Merging differences between 1.46 and 1.47 into ZExtensions
M menu_scripts/Y/ZExtensions

cvs commit: Up-to-date check failed for `lib/python/StudioCustom.py'
cvs commit: Up-to-date check failed for `menu_scripts/Y/ZExtensions'
cvs [commit aborted]: correct above errors first!

为什么它没有提交我的更改？我如何"纠正上述错误"？

Answer 1

您需要先运行更新工作副本,cvs up因为有人在您处理这些文件时已经更新了这些文件.在提交期间,CVS无法自动合并这些更改.