Re: import of multiple vendor versions + local mods

[Larry Jones]

Tim Mooney writes:
> 
> Is there something I need to do (possibly between the 1st and 2nd imports,
> or maybe after the 2nd import) to let CVS know that `foobar.h' is not
> relevant for vendor versions past the first import (its been renamed to
> FooBAR.h in vendor versions #2 and #3).

Yes, you need to do a merge after each import (other than the first)
even if there aren't any conflicts.  WHEN you do it isn't particularly
important, so now would be a good time:

        cvs checkout -j FOOBAR_ORIG -j FOOBAR_20011020 contractsoft/FooBAR
        cd foo
        cvs commit -m'merge 20011020'

You should do the same thing for the third import, but since you know
there weren't any structural changes, it isn't necessary.

> Next, I *thought* I wanted to create a "local-patches" branch, where we
> keep our local mods to the vendor source, but after some reading and
> reading between the lines, I'm guessing that that wasn't necessary?
> Assuming we only have one line of local patches against the vendor source,
> there's no need to specifically do a branch is there -- our local stuff
> just lives on the HEAD, right?

Right.

> Anyway, here's what I (probably wrongly) did:
> 
>       cd somewhere-else
>       cvs rtag -b -r FOOBAR_20010110 ndsu-patches contractsoft/FooBAR
>       cvs checkout contractsoft/FooBAR
>       <untar our modified copy of the sources for foobar, overwriting the
>       ones I checked out>
> 
> At this point, I haven't committed the changed (locally-modified) copies
> of the patches, because I'm not sure I'm proceeding down the right
> trail.

You are, unwittingly.  You made a branch, but you haven't used it -- you
checked out the head rather than your branch, which is exactly the right
thing to do.  Once you do the above merge, you should update your
working directory which should delete the defunct foobar.h and then you
can commit your changes (to the trunk).

-Larry Jones

My brain is trying to kill me. -- Calvin