[cvsnt] Problem merging file added on HEAD into a branch

Gerhard Fiedler lists at connectionbrazil.com
Fri Jul 20 18:18:05 BST 2007

Bartolomeo Nicolotti wrote:

>> Not sure, but what happens when you now update the branch? Does it stay
>> or does it go away? If it stays, the merge somehow already marked the
>> file as now being on the branch, without an actual commit on the
>> branch.

> Yes, I think you're right! Here's the log for the added file:

I think I was wrong. The merge does add such files automatically, but a
commit is still necessary. See also

So I can't explain your results.


More information about the cvsnt mailing list