Description Arthur Daussy 2014-12-10 10:42:05 EST

Adding the same values in a multi value attribute/reference but in a different order in two models only creates pseudo conflict instead of real conflict.
For example I have a multi value reference in my origin model. In the version Mx of my model, I add 3 values in this order A,B and C. In the version My of my model, I add the same 3 values in this order C,B and A. It gives:

	Left	|	Right
      -------------------------
       A        |	C
       B	|	B
       C	|	A

EMF Compare should detect a conflict between the addition of A and C in my model Mx and My. Instead it only creates pseudo conflict.

The problem comes from the org.eclipse.emf.compare.conflict.DefaultConflictDetector.matchingIndices(Comparison, Match, EStructuralFeature, Object, Object) method that does not handle correctly the index of the 2 newly added elements.