?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 9d596aa) | patch
[418472] Cannot merge a move from nestedClassifier to packagedElement75/23875/4
commit44376d56ef76ef39885628c4ec4c7649e1b2f942
authorAxel Richard <axel.richard@obeo.fr>
Tue, 25 Mar 2014 16:36:47 +0000 (25 17:36 +0100)
committerAxel Richard <axel.richard@obeo.fr>
Fri, 28 Mar 2014 10:41:29 +0000 (28 11:41 +0100)
tree00270a5009a9c6fc4f3f16c1d3b15099ceabcb3dtree | snapshot (tar.gz zip)
parent9d596aa085e4af0640b55bfb94dd2206b9fbcbe8commit | diff
[418472] Cannot merge a move from nestedClassifier to packagedElement

In case of containment references, the target reference of a move diff
can be different from the source reference. This case wasn't managed by
compare.

Bug: 418472
Change-Id: Ibe82d0b74992174567381a604d772867b51327db
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/fullscope/referencecontainmentmultimove/left.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/fullscope/referencecontainmentmultimove/right.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models