info-cvs
[Top][All Lists]
Advanced

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

RE: Reimporting vendor projects where items have been deleted


From: Nathan Herring
Subject: RE: Reimporting vendor projects where items have been deleted
Date: Tue, 20 Mar 2001 16:44:28 -0800

Is there some place to make feature requests such as this one?

I'd like to have the option on successive imports to mark as deleted any
files that previously existed on that vendor branch that are not in the
import. 

To wit,

cvs import -m "version 1" themodule vendor vendor-v1
>cvs creates themodule/file, with versions 1.1.1.1, 1.1, and "vendor"
vendor branch 1.1.1.
cvs import -m "version 2" themodule vendor vendor-v2
>cvs notices that file isn't in the import, but it is on the "vendor"
branch, and so makes a new version 1.1.1.2 marking the file as deleted.

Thx,
nh

-----Original Message-----
From: Nathan Herring 
Sent: Sunday, February 25, 2001 2:43 PM
To: 'address@hidden'
Cc: 'address@hidden'
Subject: RE: Reimporting vendor projects where items have been deleted


Right, but you end up with version 1.2 on the main trunk marked as
deleted,
and it doesn't have the vendor tag for version 2.

So, you suggest:

cvs import -m "version 2" themodule vendor vendor-v2
<then, in the enlistment>
cvs co -j vendor-v1 -j vendor-v2 themodule
cvs ci -m "remove vendor files"
<then, some weird amount of stuff to figure out exactly what was
deleted>
cvs tag vendor-v2 <files>

This is OK, but it'd be better to have the option to auto-delete those
files
as version 1.1.1.2 on the vendor branch.

nh

-----Original Message-----
From: address@hidden [mailto:address@hidden
Sent: Friday, February 23, 2001 8:38 PM
To: Nathan Herring
Cc: address@hidden
Subject: Re: Reimporting vendor projects where items have been deleted


address@hidden writes:
> 
> If I am importing a vendor project for the second or subsequent times 
> on the same vendor branch, how can I mark the files that no longer 
> exist in the vendor projects as deleted on the vendor branch?

Doing the merge that CVS suggests when there are conflicts (even if
there aren't any conflicts) will mark the appropriate files for
deletion.  Committing the results of the merge will then delete them.

-Larry Jones



reply via email to

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