On Wed, 2014-04-09 at 11:36 +0200, Patrick Ohly wrote: > The problem that I was alluding to earlier is that merging > > winning: TEL = [ '1', '2' ] and > loosing: TEL = [ '1', '2', '3' ] > has no unambiguous solution. Was '3' added on the loosing side or was it > removed on the winning one? > > If in doubt, probably the best approach is to pick the one which avoids > data loss, i.e. preserve '3'. > > Now, consider reordering: > winning: TEL = [ '1', '2' ] and > loosing: TEL = [ '2', '1' ]. > > Were the entries merely reordered or were the values changed on the > loosing side? In the former case, nothing needs to be done and no > information gets lost. In the later case, the changes made on the client > get lost. [...] > Copying extra values from the loosing side can work with reordering by > looking at each value and not just at the end of the array. It's not > perfect, though, when values were edited.
I implemented the "copy from loosing side" for any of the repeating values. This will appear in 1.4.99.2. -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. _______________________________________________ os-libsynthesis mailing list os-libsynthesis@synthesis.ch http://lists.synthesis.ch/mailman/listinfo/os-libsynthesis
