[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: 3rd party software import deleted file issue
From: |
Greg A. Woods |
Subject: |
Re: 3rd party software import deleted file issue |
Date: |
Tue, 25 Sep 2001 02:58:28 -0400 (EDT) |
[ On Monday, September 24, 2001 at 17:03:25 (-0400), Murray, Joe wrote: ]
> Subject: 3rd party software import deleted file issue
>
> We have imported it a number of times with the following:
>
> cvs import -m "Import of sw release JAN01" sw DSRSW JAN01
>
> When we get the next release we do the following:
>
> cvs import -m "Import of sw release MAY01" sw DSRSW MAY01
>
> We do a cvs co on sw and build and all is well. However, we recently
> received a new update that has had major internal modifications. The SW
> group has reorganized and eliminated many depricated files. We did the
> import as follows:
>
> cvs import -m "Import of sw release SEP01" sw DSRSW SEP01
>
> It imported fine and we then did a checkout as follows:
>
> cvs co sw
That won't work properly.
You need to do a merge of vendor changes to the local branch. Only the
merge will detect removed (and revived) files.
What I always do (and I have ~1.5GB of 3rd-party code in over 200
modules, some very large including X11, *BSD, etc.) is keep a checked
out working directory (or create one _before_ I begin the import) and
then immediately after the import I do the following in that working
directory (using your examples above):
cvs update -j MAY01 -j SEP01 .
and I then clean-up, check, and commit the result....
--
Greg A. Woods
+1 416 218-0098 VE3TCP <address@hidden> <address@hidden>
Planix, Inc. <address@hidden>; Secrets of the Weird <address@hidden>