?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: ca965b9) | patch
[493527] Correct conflict when concurrently unapplying UML stereotypes42/72642/8
commitf31cf0e1f9a6a6a330374a705c0c5ffb32caae3a
authorMartin Fleck <mfleck@eclipsesource.com>
Thu, 12 May 2016 13:49:26 +0000 (12 15:49 +0200)
committerMartin Fleck <mfleck@eclipsesource.com>
Tue, 7 Jun 2016 12:01:59 +0000 (7 14:01 +0200)
treeabf0d3a9679db270d4d997ef67ac64b469c3492ftree | snapshot (tar.gz zip)
parentca965b9c322c2c3c9e1d0374341d799a4cd22bb3commit | diff
[493527] Correct conflict when concurrently unapplying UML stereotypes

Test whether the reference change conflicting with the
ResourceAttachmentChange refers to a deleted object to determine the
correct conflict kind in the DefaultConflictDetector.

Includes tests.

Bug: 493527
Change-Id: Ib830f326554f2dfea590a3a3e282a56a581e24dd
Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF diff | blob | blame | history
plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/resourceattachment/stereotype/RemoveStereotypeApplicationPseudoConflictTest.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/resourceattachment/stereotype/data/left.uml [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/resourceattachment/stereotype/data/origin.uml [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/resourceattachment/stereotype/data/right.uml [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllTests.java diff | blob | blame | history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models