?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 372356b) | patch
[434827] Wrong overlay icon after merge60/26860/4
commitabba5e589cce1741086a09eb9af5446e990df54c
authorArthur Daussy <arthur.daussy@obeo.fr>
Mon, 19 May 2014 13:54:20 +0000 (19 15:54 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Tue, 20 May 2014 15:37:41 +0000 (20 17:37 +0200)
tree6eb372e448b6651240a66c60140f3730753e3274tree | snapshot (tar.gz zip)
parent372356b54bc93a33e08b0f48432057ba78f2dbf5commit | diff
[434827] Wrong overlay icon after merge

Fix wrong overlay icon after merge. The problem came from
MergeRunnableImpl#markAsMerged(Diff,MergeMode,boolean) where the already
merged diff was still processed.
Provides a unit test of the related bug.

Bug: 434827
Change-Id: I8ffb5c58ffdb20d58fbbff45b7c8a41c5051e23a
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
Also-by: Axel Richard <axel.richard@obeo.fr>
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug434827.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/_434827/left.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/_434827/origin.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/_434827/right.nodes [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java [copied from plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.java with 82% similarity] diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models