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
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs