Re: Reimporting vendor projects where items have been deleted

[Laine Stump]

address@hidden (Larry Jones) writes:
> [ example of cvs import followed by merge auto-deleting files ]

That's great, but your example doesn't use the tags normally suggested
in the results of imports, eg "-j NET:yesterday -j NET" (which in this
case wouldn't work anyway because it had been less than a day between
imports, but that's beside the point).

When I do *exactly* the command suggested by cvs import, no deletes
are scheduled, even though it has been more than a day since my last
import. (Yes, I just tried it again to double-check).

Here's what you first said:

address@hidden (Larry Jones) writes:
> 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.

That still is incorrect - apparently this is only done if you specify
exact tags in the command; it doesn't happen if you use branch tags
and/or date specifications (yesterday, two days ago, etc) as the
command suggested by cvs import (ie "the merge that CVS suggests")
does. I'll leave it up to you to decide whether this is a bug in CVS,
or you misspoke ;-)

Anyway, I'm glad to know that there is a way to make it work, even if
it doesn't work when I follow CVS' instructions.

address@hidden (Larry Jones) writes:

> Laine Stump writes:
> > 
> > This was the first import in about 6 months. All the differences in
> > files, and new files, were merged correctly. However, your message had
> > indicated that file deletions would also be marked when I did the
> > merge; this was not the case.
> 
>       bash-2.02$ echo file1 >file1
>       bash-2.02$ echo file2 >file2
>       bash-2.02$ cvs import -m first tst NET FIRST
>       N tst/file1
>       N tst/file2
>       
>       No conflicts created by this import
>       
>       bash-2.02$ rm file1
>       bash-2.02$ echo file3 >file3
>       bash-2.02$ cvs import -m second tst NET SECOND
>       N tst/file3
>       U tst/file2
>       
>       No conflicts created by this import
>       
>       bash-2.02$ cvs co -j FIRST -j SECOND tst   
>       cvs checkout: Updating tst
>       U tst/file1
> ==>   cvs checkout: scheduling tst/file1 for removal
>       U tst/file2
>       U tst/file3
>       bash-2.02$ cd tst
>       bash-2.02$ cvs ci -m merge
>       cvs commit: Examining .
> ==>   Removing file1;
> ==>   /public/CVS/tst/file1,v  <--  file1
> ==>   new revision: delete; previous revision: 1.1.1.1
> ==>   done
> 
> -Larry Jones
> 
> I'm so disappointed. -- Calvin