[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: commit to branch

From: Szabó Tamás
Subject: Re: commit to branch
Date: Tue, 20 Mar 2001 18:08:43 +0200


> But when I do:
> cvs ci -m "message" -r MyBranch
> it fails with:
> cvs commit: Up-to-date check failed for `'
> cvs [commit aborted]: correct above errors first!
> But the file is Up-to-date on the main trunk.

Yes. But probably the file is not up-to-date on the branch. 
By specifying -r MyBranch the commit will be done on the MyBranch branch
=> the up-to-date check will be made on the that is on

You made the branch and after that you(or someone else) modified the on the branch and commit it of course.
That's while the up-to-date check fails.

I think that you should update your file 

cvs up -r MyBranch

Solve the conflicts if any and use commit after that.
You don't have to use -r because -r is sticky, so you are on the branch.

cvs ci

Now if you want you can update with the -A parameter to clear the sticky
tag and return to the main trunk.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]