Public Git Hosting - EMFCompare2.git/commit

commit	e4f7d8ea83b77a673070b1c776d9ff4affc8f383
author	Arthur Daussy <arthur.daussy@obeo.fr>
	Thu, 22 May 2014 09:15:54 +0000 (22 11:15 +0200)
committer	Axel Richard <axel.richard@obeo.fr>
	Wed, 28 May 2014 07:29:29 +0000 (28 09:29 +0200)
tree	3475a220f1be2bb7a5a69851efdd9d6b302202b8	tree \| snapshot (tar.gz zip)
parent	9699c6bb2e838dba818b4a7f95ff70ce968c6cbc	commit \| diff

[434822] Conflict between move and delete

Fix merge and display in case of a conflict between a move and a delete.
Tests the merge data after accepting and rejecting differences.

Bug: 434822
Change-Id: I7c61a077a984fc8039fc250c88bf2b1bafa9e7ce
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
Also-by: Axel Richard <axel.richard@obeo.fr>

plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/IMergeRunnable.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug434822.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/_434822/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/_434822/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/_434822/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/BugsTestSuite.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/req/DefaultReqEngine.java		diff \| blob \| blame \| history

Eclipse foundation framework to comapre EMF models

RSS Atom