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 email@example.com.
> From: Tony Hoyle [mailto:tmh at nodomain.org] > > It's more that the deletion is special cased on the code as there are > special conditions involved. eg. you merge a file which has been > deleted on branch1 but modified on branch2.. must force a conflict > there. Ok, in that case there is clearly a conflict. But if the file has been deleted on branch1 and not modified on branch2 then surely any merge should result in a deleted file? Andy -- Andy Harrison - Platform Software Engineer Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK "No matter how bad things seem... ...nothing could be worse than being used as a towel rail." - A.A. Milne Please note that my email domain has changed from @anitetelecoms.com to @anite.com Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue, Slough, Berkshire SL1 4PF, United Kingdom Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.