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.
Hello Tony, ... TH> Let's go through this again. For the final time. TH> Create file - Revision 1.1 TH> Commit a revision to A - Revision 1.1.2.1 TH> Make changes on A - Revision 1.1.2.2 TH> Make changes on HEAD - Revision 1.2 TH> Merge HEAD->>A - diff(1.1:1.2)->1.1.2.3 That's ok. Now we have a MergeArrow from 1.2 to 1.1.2.3 TH> Merge A->>HEAD TH> With one directional mergepoints: TH> diff(1.1:1.1.2.3)->>1.2 (not quite correct -- the resulting revision is 1.3 here) TH> With bidirectional mergepoints: TH> diff(1.1.2.3:1.1.2.3)->1.2 (ie. a null diff, losing the changes in TH> 1.1.2.1 and 1.1.2.2). No that's not the way the code works! The patched Version (bidirectional mergepoints) will do diff(1.2:1.1.2.3)->>1.3 so there is no data lost (at least in this very simple example) but avoidable conflicts are ommited. Give it a try! -- Best regards, Richard mailto:richard at wirthware.de