[cvsnt] Mergepoint issues on 184.108.40.206 b2382
richard at wirthware.de
Fri Jan 12 15:28:54 GMT 2007
TH> Let's go through this again. For the final time.
TH> Create file - Revision 1.1
TH> Commit a revision to A - Revision 220.127.116.11
TH> Make changes on A - Revision 18.104.22.168
TH> Make changes on HEAD - Revision 1.2
TH> Merge HEAD->>A - diff(1.1:1.2)->22.214.171.124
That's ok. Now we have a MergeArrow from 1.2 to 126.96.36.199
TH> Merge A->>HEAD
TH> With one directional mergepoints:
(not quite correct -- the resulting revision is 1.3 here)
TH> With bidirectional mergepoints:
TH> diff(188.8.131.52:184.108.40.206)->1.2 (ie. a null diff, losing the changes in
TH> 220.127.116.11 and 18.104.22.168).
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!
Richard mailto:richard at wirthware.de
More information about the cvsnt