Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 352975

Summary:	ReferenceOrderChange are never detected as conflictual
Product:	[Modeling] EMFCompare	Reporter:	Mikaël Barbero <mikael.barbero>
Component:	Core	Assignee:	EMF Compare <emf.compare-inbox>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	laurent.goubet
Version:	unspecified
Target Milestone:	Kepler
Hardware:	PC
OS:	Linux
Whiteboard:

Description Mikaël Barbero

2011-07-25 04:15:40 EDT

Steps to reproduce:

If a reference is populated with values [a0, a1, a2, a3, a4] in the ancestor.

I modify it locally by moving a2 to the head of the list [a2, a0, a1, a3, a4].

It has been remotly modified by moving a2 to the queue of the list [a0, a1, a3, a4, a2].

checkReferenceUpdates(DiffGroup, Match3Elements, EReference) never falls in a case where it can create a conflictual ReferenceOrderChange.

Comment 1 Laurent Goubet

2013-01-11 11:05:43 EST

Conflict detection on EMF Compare 1.* "reference order" difference was impossible (rather, extremely complex) because of the way they were detected.

EMF Compare 2 properly detects these conflicts.