Re: vendor branching and merge

[Eric Siegerman]

On Fri, Feb 22, 2002 at 12:54:46PM +0100, heatherw wrote:
> In the interest of time, the vendor sent only those files that were
> different from the last set they sent.
> Now when I try to merge [from vendor the branch], cvs schedules all the 
> missing files for
> removal. I tried both
>
> cvs co [-rHEAD] -d testdir1 module
> cd testdir1 
> cvs update -j last_import_tag -j this_import_tag

The problem, as you've probably guessed, is that only the changed
files have had "this_import_tag" applied.  For the ones that
haven't changed since the last vendor release, the vendor branch
contains the right data, but not the tag.  For doing a merge, the
tag's as important as the contents.

One (not so good) way out would be:
        cvs update -j last_import_tag -j vendor_branch_tag

That'll work fine for this merge.  But then you'll be in trouble
the next time you need to merge from the vendor branch, as you'll
have no useable tag name for the first -j.

>  
> and
>  
> cvs co -jrelease_tag (matches head rev) -j this_import_tag 

This is right out. :-)

> 
> The best thing I can think of doing is checking out the head revision,
> copying over the changed files and commiting.

Right idea, wrong branch :-)  Check out *the vendor branch*, or
alternatively untar the previous (complete) vendor distribution,
if you still have it; copy over the changed files; then import
the results again.  That'll give you, on the vendor branch, a
complete -- and completely tagged -- copy of the latest release,
from which to do both this merge and the next one.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
One ring to rule the mall.
        - Movie review headline, eye Magazine