Re: Again: multiple vendors

[Greg A. Woods]

[ On Wednesday, March 2, 2005 at 22:19:22 (+0100), Baurzhan Ismagulov wrote: ]
> Subject: Again: multiple vendors (was: Re: Long version numbers | Tedious to 
> keep track)
>
> I've got 4 upstream vendors and want to keep them in different branches.
> I have two goals: importing new upstream versions and merging the deltas
> into the main trunk, and tracking which change introduced a particular
> bug.

Do not use "cvs import".  It can not work as any part of what you want
to do.

Just create a separate, normal, branch (direct from the trunk) for each
supplier to "work on", and "manually" commit each of their releases to
their branch as you obtain them (this can all be automated with very
simple little scripts).

You can then manually merge their changes to the trunk, and any other of
your local branches as necessary and desired, from one supplier's branch
at a time.

(you'll of course have to start the module, i.e. with the files at the
base 1.1 revision, with some variant of the code -- presumably all these
suppliers have started with some common baseline too, so maybe that
would be the best to start your module with, though it really doesn't
matter provided none of the other maintainers have mucked around with
unnecessary filename changes)

As for the "tracking changes which introduce bugs", well that's up to you! :-)

-- 
                                                Greg A. Woods

H:+1 416 218-0098  W:+1 416 489-5852 x122  VE3TCP  RoboHack <address@hidden>
Planix, Inc. <address@hidden>          Secrets of the Weird <address@hidden>