Re: Again: multiple vendors

[Baurzhan Ismagulov]

Hello Greg,

thanks for your answer!

On Thu, Mar 03, 2005 at 03:58:42AM -0500, Greg A. Woods wrote:
> > 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.

Hmm, Cederqvist recommends it in
https://www.cvshome.org/docs/manual/cvs-1.12.11/cvs_13.html#SEC108


> 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).

I thought about that, but this is going to be a bit time-consuming due
to:

1. Added and deleted files: I have to track them manually when I apply
   the delta for a new upstream release. I have to grep for 1970 and add
   / remove the files.

2. CVS keywords in the upstream patches. I have to import the previous
   and the current release into a temporary module and produce the diff
   with -kk.


That is why I was wondering if the method described in the manual could
work for me.


With kind regards,
Baurzhan.