[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: (no subject)

From: David Holland
Subject: Re: (no subject)
Date: Wed, 30 Jan 2002 17:44:51 -0500 (EST)

 > > 
 > >    (It would also be nice if there were a way to automatically
 > >    track deletes at import time, but that's (1) hard and (2) a
 > >    separate issue.)
 > There is.  After each import, do:
 >      cvs co -jPREV_REL_TAG -jCURR_REL_TAG module
 > where PREV_REL_TAG is the release-tag you used the previous time you
 > imported the module and CURR_REL_TAG is the release-tag you used in the
 > import you just did.  If any files were deleted, CVS will mark them for
 > deletion from the trunk and a subsequent commit will commit the
 > deletions.  Note that you *must* use the two revision tags; using the
 > branch name with ":yesterday" as suggested by CVS and as shown in the
 > manual is not sufficient.

Either it doesn't in the CVS I have (1.10), or you misunderstood what
I was asking for. When you import a new vendor source tree, the only
way you can tell that files should be deleted is by noticing that they
are on the vendor branch but *didn't* get imported this time around.
I've never seen CVS notice this and mark the files as deleted; one has
to scan afterwards for files missing the new revision tag and
explicitly delete them off the vendor branch.

IME once you do that, it *does* propagate the deletion to the main
branch. But I've always used explicit revision tags when merging
imports, ever since long ago I did two successive imports on one day. :-) 

   - David A. Holland             |    VINO project home page:
     dholland@eecs.harvard.edu    | http://www.eecs.harvard.edu/vino

reply via email to

[Prev in Thread] Current Thread [Next in Thread]