[cvsnt] Mergepoint issues on b2382

Richard Wirth richard at wirthware.de
Fri Jan 12 15:28:54 GMT 2007

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
TH> Make changes on A - Revision
TH> Make changes on HEAD - Revision 1.2
TH> Merge HEAD->>A - diff(1.1:1.2)->

That's ok. Now we have a MergeArrow from 1.2 to

TH> Merge A->>HEAD

TH> With one directional mergepoints:
TH> diff(1.1:>>1.2
(not quite correct -- the resulting revision is 1.3 here)
TH> With bidirectional mergepoints:
TH> diff(>1.2 (ie. a null diff, losing the changes in 
TH> and

No that's not the way the code works!
The patched Version (bidirectional mergepoints) will do


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

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook