Re: commit to branch

[Szabó Tamás]

Hi!

> But when I do:
> 
> cvs ci -m "message" -r MyBranch TestFile.java
> 
> it fails with:
> 
> cvs commit: Up-to-date check failed for `TestFile.java'
> 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 TestFile.java that is on
MyBranch.

You made the branch and after that you(or someone else) modified the
TestFile.java 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 TestFile.java

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 TestFile.java

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


Tamas