Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Conflicts on Diagram Coordinates Changes
A Diagram Coordinates change is a specific GMF change introduced by the GMF support of EMF Compare.
It refines two ReferenceChanges, one a the 'x' coordinate of a shape, and one on the 'y' coordinate of a shape.
This specification is linked with the bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=458961
In case of a conflict on Diagram Coordinates changes, the conflict currently shows only one difference when the Diagram Refined elements filter is active. The conflict displays 3 unresolved differences (the refined one and both 'x' coordinates).
When the Diagram Refined elements filter is off, the first conflict on 'x' coordinates displays 3 unresolved differences but shows 2. The second conflict on 'y' coordinates displays 2 unresolved conflicts and shows 2.
Proposal of evolution
When the Diagram Refined elements filter is active, a conflict of coordinates should show two differences. One from the left side and one from the right side. The conflict should display 2 unresolved differences (the refined ones).
When the Diagram Refined elements filter is off, the first conflict on 'x' coordinates should display 2 unresolved differences and show 2. The second conflict on 'y' coordinates should display 2 unresolved conflicts and show 2.