[448464] Source list incorrectly determined when undoing changes96/35396/3
commit1799b4767af3db1fc9a06ef9c123ed9d5acd262f
authorAlexandra Buzila <alexandra.buzila@gmail.com>
Thu, 23 Oct 2014 10:28:36 +0000 (23 12:28 +0200)
committerLaurent Goubet <laurent.goubet@obeo.fr>
Wed, 29 Oct 2014 08:03:58 +0000 (29 04:03 -0400)
treecd6abaef3e2d0e130b0df9ee365453d0e9191471
parentd8a83af8b15c8d0fb4a13dbcbb06d29240d35bf9
[448464] Source list incorrectly determined when undoing changes

When computing the insertion index during a three-way merge of a change
that affects multi-valued features, the source list of a diff was
incorrectly determined in DiffUtil#getSourceList(Comparison comparison,
Diff diff, boolean rightToLeft) if the current merging undoes a change.
With the current fix, the source list is obtained from the _target
container_ retreived from the _match in the origin_, as opposed to the
list obtained from the _match in the origin_.

The commit also updates the tests that are reaching the now modified
code.

Bug: 448464
Change-Id: I3c53b9ff533b1466d5fddce5f91f5b6de38d9fe8
Signed-off-by: Alexandra Buzila <alexandra.buzila@gmail.com>
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java