Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 352975 - ReferenceOrderChange are never detected as conflictual
Summary: ReferenceOrderChange are never detected as conflictual
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: Kepler   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-25 04:15 EDT by Mikaël Barbero CLA
Modified: 2013-01-23 07:23 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mikaël Barbero CLA 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 CLA 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.