Conflict on commit (was RE: [cvsnt] Re: How do I commit again after using cvs update -rpre-bookmark?)

Siegfried Heintze siegfried at
Sat Oct 30 19:07:41 BST 2004

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to

OK, after rolling back two versions (tags) in a new sandbox and retrieving
the C++ preprocessor macros and inserting those into the old sandbox, I can
now build again in the old sandbox. HURRAY! (I wish I could build in the new
sandbox, but that is another problem. Apparently I don't have all the files
in the repository).

Now I go to the old sandbox after successfully building it and I try to
commit. It won't commit because one of my header files is not a branch.

OK, so I try CVS UPDATE header.h and try to commit again. No luck. I get
some error about header.h is not a branch. Why? Does not the UPDATE command
get the latest?

So I try CVS UPDATE -r HEAD header.h. This does a merge. Why does this do a
merge? I thought -j does a merge. I resolve the merges and I try to commit
again and it still complains that the header.h file is not a branch! Why?

So then I CVS LOG header.h and see that 1.5 is the latest. So then CVS
UPDATE -r 1.5 header.h and then try to commit. No luck, same error. Why?

So then I try CVS UPDATE -A header.h and then CVS COMMIT and I get the
error: "cvs server: file 'header.h' had a conflict and has not been
modified". I don't why it says that. The source code compiles.

I'm stuck! What am I doing wrong? How do I commit?


-----Original Message-----
From: cvsnt-bounces at [mailto:cvsnt-bounces at] On Behalf Of
Tony Hoyle
Sent: Friday, October 29, 2004 5:27 PM
To: cvsnt at cvsnt downloads at @CVSNT on Twitter CVSNT on Facebook
Subject: [cvsnt] Re: How do I commit again after using cvs update

Siegfried Heintze wrote:
> So now what do I do? In the sandbox that compiles, can I create a new
> and add the bookmark feature again?
> Whenever I have used the cvs update -r command, it will never let me
> unless I do cvs update -A first to get the latest changes. I don't want
> latest changes. What can I do?
What I'd do is create a branch.

cvs update -r pre_bookmark
cvs tag -b pre_bookmark_branch
cvs update -r pre_bookmark_branch

Then work on the pre_bookmark_branch manually putting things back until 
it breaks again or all works.

Once it's all sorted...

cvs update -A
cvs update -j HEAD -j pre_bookmark_branch
cvs commit

...and back to normal development (losing any changes before the merge, 
btw.  but since HEAD is busted anyway I can't see that being an issue).

(Not sure I got the -j the right way around... one way will work, though 

cvsnt mailing list
cvsnt at cvsnt downloads at @CVSNT on Twitter CVSNT on Facebook

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook