[Top][All Lists]

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

Re: vendor branch imports, deleted files

From: Larry Jones
Subject: Re: vendor branch imports, deleted files
Date: Thu, 31 Oct 2002 16:30:11 -0500 (EST)

Nick Patavalis writes:
> I see that when I import a new vendor version (to the vendor branch),
> files that have been removed by the vendor (but not modified by me)
> are not removed. Is this a bug or a feature?

Neither -- it means you haven't completed the import and merge process.

> Any sugestion for an easy way to find and remove these files?

You always have to merge after importing, even if CVS doesn't tell you
to.  When you do the merge:

        cvs checkout -jPREV_REL -jCUR_REL module

(note that you *MUST* use the actual release tags for this to work as
opposed to using "branch:yesterday" or any similar schemes), CVS will
mark any deleted files for removal; committing the merge completes the

-Larry Jones

I take it there's no qualifying exam to be a Dad. -- Calvin

reply via email to

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