Re: vendor branching and merge

[Greg A. Woods]

[ On Friday, February 22, 2002 at 16:09:37 (-0500), Larry Jones wrote: ]
> Subject: Re: vendor branching and merge
>
> heatherw writes:
> > 
> > hi, I use branches exclusively for vendor source. I was going merrily
> > along with branching and merging till I hit this scenario.
> > 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, cvs schedules all the missing files for
> > removal. I tried both
> 
> Using import is not appropriate in this case.

Actually I think 'import' is the correct function to use -- I concur
with Eric's earlier suggestion to unpack the previous release and then
update it manually with the new files, and finally import it as per the
normal process you'd use if you got an entire release from the vendor.

Working on a checked out vendor branch is not always going to have the
correct results with CVS -- the vendor branch is too magic.  It may or
may not work correctly in this situation, but "cvs import" will always
work correctly.  Sometimes the problems are subtle and won't appear for
some time.

I think it is usually safe to re-import something, provided you use the
same tag names.  The whole point of "cvs import" is to only add new
revisions if the new files contain changes (and of course to add a new
release tag).  If you re-import something from the same sources and
using the same release tag then nothing happens in the repo.

You can also import files that were missed by laying them out in the
right structure.  In this case that means you could unpack the
previously imported release, remove the changed files (that have already
been imported by the most recent partial import), and then re-run the
same import command as was used with the partial import.

-- 
                                                                Greg A. Woods

+1 416 218-0098;  <address@hidden>;  <address@hidden>;  <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>