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

[Gerhard Fiedler]

Bartolomeo Nicolotti wrote:

> I've added a file to the HEAD trunk with other changes that I wanted to
> merge into a branch, so I committed everything on the HEAD, switched to
> the branch and did:
> 
> ...
> cvs update -j HEAD addedfile.txt
> ...
> 
> Then doing cvs -n update it correctly gave
> 
> ...
> A addedfile.txt
> ...
> 
> but when I tried to commit the added file in the branch cvs gave the error
> 
> Conflict, the file addedfile.txt was already added.

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.

Gerhard