Re: Again: multiple vendors

[Baurzhan Ismagulov]

Thanks to all for comments and suggestions!

On Thu, Mar 03, 2005 at 05:50:02PM -0500, Greg A. Woods wrote:
> > > 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
> 
> Read again.
> 
> There's nothing in there about multiple vendors (or if there is and I've
> forgotten about it, it's blatantly wrong and misleading).
> 
> Multiple vendor branches CANNOT work for what you want.  Period.

I'm not challenging your opinion, I'm trying to understand how the thing
works. I would be glad if you could elaborate one level deeper and
answer the question _why_ it isn't going to work with imports (a pointer
to the manual would be also ok).

For concreteness, let's look at the following scenario: assume I create
the branches in the way that Pierre suggested:

LINUS      1.1.3
RMK        1.1.5
PXA        1.1.7
HWVENDOR   1.1.9

If the last tag in HWVENDOR is called bsp102 and I do "cvs import -b
1.1.9 linux HWVENDOR bsp106", what is going to go wrong? The goal is
to do "cvs update -jbsp102 -jbsp106" in HEAD.


> (indeed vendor branches don't mix well with normal branches either)

What is the difference?


> > 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.
> 
> Yeah, so?  This problem exists regardless of how you deal with third
> party code that also uses RCS keywords.

I didn't notice this when I played with import. I'll recheck.


> Also, you can trivially preprocess the third-party code to remove or
> adjust those keyword instances if you want to avoid this hassle all
> together.

I'm not sure it were that trivial without import and -kk -- keywords
occur not only in comments, some of them occupy more than one line, so
it would require at least half of a day to develop and debug a parser
for that; that is why I asked about that import stuff in the first
place.


> > That is why I was wondering if the method described in the manual could
> > work for me.
> 
> You say you want to do something that is not described at all in the
> manual, so nothing in the manual can work for your purposes.

Well, the section
https://www.cvshome.org/docs/manual/cvs-1.12.11/cvs_13.html#SEC112
is called "multiple vendor branches", and that is what I wanted to have.
Sorry that I didn't know that the manual was wrong :) .


I've started playing with the way you had suggested, but I'd really like
to understand how import works and why it couldn't help me.


With kind regards,
Baurzhan.