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

[Gerhard Fiedler]

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
<http://www.cvsnt.org/manual/html/Merging-adds-and-removals.html>.

So I can't explain your results.

Gerhard