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 sales@march-hare.com.
> From: Phil Richards [mailto:news at derived-software.ltd.uk] > > Unless CVS keeps mergepoints around and takes account of them when > you do the commit, this code backout that you have performed will > not be "remembered". Next time you merge from mainline-to-branch > you will have to do it again. Recording the mergepoint and a null > delta stops that from happening. Yeah, I see your point. I guess the best way to get around it is when you would want to merge Main->Dev2, instead you branch off Main again with Dev2.1 and merge Dev2->Dev2.1 and carry on from there. Any reason why that shouldn't work? Andy Harrison Platform Software Engineer Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK http://www.anite.com/telecoms 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.