How to fix issue when committing a change to CVS

cvs commit conflict
alwbtc picture alwbtc · Sep 8, 2011 · Viewed 25.8k times · Source

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"?

Answer

DarkDust picture DarkDust · Sep 8, 2011

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.

Related questions

How do we verify commit messages for a push?

Coming from CVS, we have a policy that commit messages should be tagged with a bug number (simple suffix "... [9999]"). A CVS script checks this during commits and rejects the commit if the message does not conform. The git hook commit-msg …

Read More
Difference between GIT and CVS

What is the difference between Git and CVS version control systems? I have been happily using CVS for over 10 years, and now I have been told that Git is much better. Could someone please explain what the difference between the …

Read More
CVS: List all files changed between tags (or dates)

Is there any way to list all the files that have changed between two tags in CVS? Every time we do a release we apply a tag to all the files in that release. I want to find all the …

Read More