Re: vendor branching and merge

[Larry Jones]

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.  What you need to do is to
check out the vendor branch, copy the new files over top of the checked
out ones, cvs add any new ones, cvs remove any deleted ones, and then
commit the working directory (which is on the vendor branch), tag it
with the new release tag, and then proceed as if you had done an import
and merge the changes from the vendor branch to the trunk.

-Larry Jones

I suppose if I had two X chromosomes, I'd feel hostile too. -- Calvin