Re: multiple cvs imports

[Greg A. Woods]

[ On Friday, September 28, 2001 at 11:45:35 (-0700), Stuart Donaldson wrote: ]
> Subject: multiple cvs imports
>
> When using cvs import, and merging in conflicts, cvs reports that the 
> way to merge the conflicts is with:
> 
>     cvs checkout -jVENDOR:yesterday -jVENDOR module
> 
> However if I am importing multiple times to get several versions of a 
> project into CVS, it seems this would break if I was doing it all the 
> same day.  

it sometimes breaks even if you've only done one merge per day....  :-(

> Is there a better way to get several versions into CVS?

RTFM!  (as usuall ... :-)

        cvs co -j VENDOR-REL-1 -j VENDOR-REL+1 module

(i.e. use the previous release tag and the one just created by the most
recent import)

You can probably do many imports and just one merge too....  Always just
use the vendor release tag from the last merge, plus the new one
(ignoring the directory navigation):

        cvs import foo vend vend-1
        cvs co foo
        cvs import foo vend vend-2
        cvs update -j vend-1 -j vend-2
        cvs import foo vend vend-3
        cvs import foo vend vend-4
        cvs import foo vend vend-5
        cvs import foo vend vend-6
        cvs import foo vend vend-7
        cvs update -j vend-2 -j vend-7

-- 
                                                        Greg A. Woods

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