Hi John, If you create the file again on disk and then perform CVS add operation, the file will be resurrected. This is the official way to cancel a non-committed remove according to the Cederqvist. Then you should be able get the remote changes and then retry the remove operation as required.
Regards, Brian -----Original Message----- From: John Deighan [mailto:[EMAIL PROTECTED]] Sent: 02 July 2002 20:44 To: [EMAIL PROTECTED] Subject: �Cvsnt� odd situation I've run into an odd situation a couple of times now. If I select a file, and select 'Remove Selection' from the menus, it marks the file as removed. Then I'm supposed to commit the removal, but if it turns out that someone else has modified the file, and committed the change, I'm stuck in a situation where I get the "Up-to-date check failed" message, but I can't merge in the changes before committing the removal (which wouldn't really make much sense anyway, since I'm going to remove the file anyway), I can't commit the removal, and I don't know of any way to "undo" the "Remove Selection" operation so I could merge in the change (which isn't really needed), then remove the file. How should I be handling this situation? (I know I can manually edit the "Entries" file, remove the file, update the file, then remove it, which I did and it worked, but shouldn't really be necessary) _______________________________________________ Cvsnt mailing list [EMAIL PROTECTED] http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt _______________________________________________ Cvsnt mailing list [EMAIL PROTECTED] http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
