[cvsnt] Re: Bug deletion of file modified by second party

[Richard Wirth]

Hello Oliver,

Tuesday, September 13, 2005, 1:16:46 PM, you wrote:

OK> Richard Wirth <richard at wirthware.de> writes:

>>   User A deletes file with version 1.3
>>   -- cvs remove test.txt
>>   -> cvs server: use 'cvs commit' to remove this file permanently
OK> [...]
>>   The only way for clearing this situation is to delete the respective
>>   line from CVS/Entries and do an update afterwards :-(

OK> I came across this problem, too and agree with you that a "get clean
OK> copy" would feel natural in this situation. But the low level editing
OK> of CVS/Entries goes too far. The opposite command for cvs remove is
OK> cvs add. This will bring back the file ready to be removed again... ;-)

Ah! Yes. that fixed the problem! But it's somewhat strange...
So I would like to see a hint which is not that missleading?
What about:
"conflict: removed test.txt was modified by second party - re-add the file first"



-- 
Best regards,
 Richard                            mailto:richard at wirthware.de