Re: problems merging from branch to mainline

[Larry Jones]

Daniels, Dave F writes:
> 
> What I expected to happen was file 'foo.jsp' would be updated from the
> changes in 1.1.2.9, which I would turn around and commit. Instead, I get the
> message:
> 
> cvs server: file foo.jsp exists, but has been added in revision 1.1.2.9

That means that foo.jsp did not exist when the branch was created but
was subsequently created independently on both on the branch and on the
trunk.  Since there's no common ancestor, there's no way for CVS to
figure out how to merge changes -- you'll have to do it by hand.  Have
you merged changes from the branch to the trunk before?  If so, that's
your problem -- merging the whole branch now is trying to merge changes
that were already merged before.  You should tag the branch when you
merge it to the trunk so that next time you can merge just the changes
after that point.

-Larry Jones

This game lends itself to certain abuses. -- Calvin