[cvsnt] Bug deletion of file modified by second party
Richard Wirth
richard at wirthware.de
Tue Sep 13 11:35:37 BST 2005
Hello Tony,
it is not possible to get the following situation solved:
User A deletes file with version 1.3
-- cvs remove test.txt
-> cvs server: use 'cvs commit' to remove this file permanently
User B commits changes to test.txt so we have now version 1.4 on the
server
User A tries to commit removed file test.txt
-- cvs commit -m deleted test.txt
-> cvs server: Up-to-date check failed for `test.txt'
User A tries to update
-- cvs update test.txt
-> cvs server: conflict: removed test.txt was modified by second party
C testtext.txt
So user A tries to get the clean copy
-- cvs update -C test.txt
-> cvs server: conflict: removed test.txt was modified by second party
C testtext.txt
No success...
The only way for clearing this situation is to delete the respective
line from CVS/Entries and do an update afterwards :-(
server and client build 2088
--
Best regards,
Richard mailto:richard at wirthware.de
More information about the cvsnt
mailing list