Re: Selective merging of changes on the vendor branch

[Larry Jones]

Duncan Higgins writes [in very long lines]:
> 

> I previously did a cvs import of 'third party code'. I have been
> making changes to the code, and checking these into cvs. I have done
> another import of the 'third party code'. I was hoping that I could pick
> only the parts of this latest code that I wanted to merge in with my
> changes. However cvs asks me to merge in all the changes. When a do a
> 'cvs -n update' it lists all the files that have changed on the vendor
> branch as having to be updated on the main trunk. Aren't these two
> separate branches of code ? 

No.  One of the features of the vendor branch support is that updates to
a file on the vendor branch are automatically reflected on the trunk as
long as there aren't any local modifications to the file (which would
require merging).  The files marked by your update are just the files
that don't have local changes -- the files that need merging won't be
marked because you do have a separate version of them on the trunk.  The
only way to know which files need merging is to actually do a checkout
with merge as suggested by import.  Note that, depending on what version
of CVS you're running, the merge suggested by import may or may not be
optimal; what you really want to do is:

        cvs co -joldrel -jnewrel module

where "oldrev" is the release tag you used the last time you imported
and "newrel" is the release tag you just used on the current import.

> How can I prevent having to merge all the
> changes on the vendor branch ?

You really can't.

-Larry Jones

I've got to start listening to those quiet, nagging doubts. -- Calvin