RE: Reimporting vendor projects where items have been deleted

[Nathan Herring]

>       cvs co -r vendor-v2 themodule

We actually check out themodule (usually we import to
themodule/somevendor) to the trunk, not to any particular tag. Thus,
this doesn't really work for us.

>       cvs co -j vendor-v1 -j vendor-v2 themodule
>       <Resolve any conflicts>
>       cvs ci themodule

Larry suggested this one. This works OK. 

One of our problems is that our client (MacCVSPro) doesn't actually
schedule files for deletion with the merge, so there's no easy way to
check in the deleted files. We, thus, need to perform the import in the
client, and then do the merge, conflict resolution, and check in on the
server (annoying, but possible).

However, it seems that it is all a completely unnecessary step, since
you already know the name of the vendor branch, and you can check
whether any particular file in the import location already has that
branch tag, but is not part of the import. In that case, you can just
put another version on that vendor branch that is "deleted", and
optionally tag it with the version tag used during import. No extra user
steps required.

Furthermore, everything is nice and tidy: the deleted version is on the
branch, so it looks like the vendor deleted it (as indeed they did), as
opposed to on the trunk, which looks like one of us deleted it.

I did some manual ,v file editing to see if I could create such an item.
I did, and it works like you'd expect.

(I realise that this is a low utility addition. :)

nh

-----Original Message-----
From: Stephen Rasku [mailto:address@hidden
Sent: Tuesday, March 20, 2001 5:20 PM
To: Nathan Herring; address@hidden
Cc: address@hidden
Subject: RE: Reimporting vendor projects where items have been deleted


Nathan Herring wrote:
>
>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.
>

I don't see why this is necessary.  If you do:

        cvs co -r vendor-v2 themodule
        
It will not check out any modules that don't have the vendor-v2 tag.  
For all intents and purposes it is deleted.

If you are making modifications to the source, then you should merge 
the changes to the head:

        cvs co -j vendor-v1 -j vendor-v2 themodule
        <Resolve any conflicts>
        cvs ci themodule
        
-- 
Stephen Rasku                   E-mail: address@hidden
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies