Re: Merging multiple vendor branches

[Greg A. Woods]

[ On , April 1, 2002 at 10:47:58 (-0800), Danial wrote: ]
> Subject: Merging multiple vendor branches
>
> This is what I tried to do but it will not work:
> 
> First, I imported the two trees using the multiple vendor importing
> method (Section 13.6 of the Cederqvist manual):
> 
> cvs import -m "Main tree" MainTree MainVendor MainRelease_0
> cvs import -m "X tree" MainTree -b 1.1.3 XVendor XRelease_0

No, it won't work.  Multiple vendor branch support was nice in theory,
but it is simply not possible to implement them properly with the trick
CVS uses to manage "cvs import" and conflict detection with local
changes.

If you have third party code that is independently modified by two or
more separate parties and you wish to record it all in a CVS repository
and perhaps use CVS to help move changes from one branch to another then
you'll have to manually create "real" CVS branches for each "third
party" and and manually check in the their changes yourself.

-- 
                                                                Greg A. Woods

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