Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to firstname.lastname@example.org.
Sebastien Abras wrote: > When USER_A updated, CVS told him he was merging changes from USER_B but > in fact, it was not, every changes USER_B made were discarded > (unfortunatly we discovered it after the merged file was commited) USER_A had an editor open and saved the unmerged file, deleting the changes (and perforce would have done exactly the same thing in the circumstances). Either always use editors that detect on-disk changes or enforce the rule that all editors must be shut down before updating. Tony