Alex Rivera | Logout

How to fix issue when committing a change to CVS

Asked 2011-09-08T08:05:43.210
15

I'm trying to commit my changes to CVS repository, but I get the following error:

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!

Why does it fail to commit my changes? How do I "correct above errors"?

Edit
Report

1 Answer

24

You need to update your working copy first by running cvs up because someone has already updated these files while you were working on them. CVS can't automatically merge these changes during commit.

answered 2011-09-08T08:09:30.510

Your Answer