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.
> Let's go through this again. For the final time. > > Create file - Revision 1.1 > Commit a revision to A - Revision 1.1.2.1 > Make changes on A - Revision 1.1.2.2 > Make changes on HEAD - Revision 1.2 > Merge HEAD->A - diff(1.1:1.2)->1.1.2.3 > Merge A->HEAD > > With one directional mergepoints: > diff(1.1:1.1.2.3)->1.2 > With bidirectional mergepoints: > diff(1.1.2.3:1.1.2.3)->1.2 (ie. a null diff, losing the changes in > 1.1.2.1 and 1.1.2.2). With respect to Tony, and apologies to others for carrying this on, that is not what happens in 2.0.58d. As I explained, when I do that last merge if does diff(1.2:1.1.2.3), not diff(1.1.2.3:1.1.2.3) as you claim. Using 2.5.03 it does indeed do diff(1.1:1.1.2.3). As you have pointed out Tony, the prime importance is the preservation of data. This is one aspect of CVS that I have always noted and been impressed with. Bearing this in mind, I realise that if I want this particular functionality (with the warnings of potential data-loss noted) then I will either have to add the patch myself or go back to 2.0.58d. So I'm going to again attempt to build the source. If I have build problems, should I address them to this list or cvsnt-dev? Rgds, Andy -- Andy Harrison - Platform Software Engineer Anite Telecoms Ltd. Ancells Business Park, Fleet, Hampshire, GU51 2UZ, UK "No matter how bad things seem... ...nothing could be worse than being used as a towel rail." - A.A. Milne A member of the Anite Group of companies. Please refer to www.anite.com for individual Anite company details. The contents of this e-mail and any attachments are for the intended recipient only. If you are not the intended recipient, you are not authorised to and must not disclose, copy, distribute, or retain this message or any part of it. It may contain information which is confidential and/or covered by legal professional or other privilege. Contracts cannot be concluded with us nor legal service effected by email. Anite Group plc Registered in England No.1798114 Registered Office: 353 Buckingham Avenue Slough Berks SL1 4PF United Kingdom VAT Registration No. GB 787 418187 Scanned for viruses by BlackSpider MailControl.