Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 369507

Summary:	Some of the complex use cases fail when merging
Product:	[Modeling] EMFCompare	Reporter:	Laurent Goubet <laurent.goubet>
Component:	Core	Assignee:	EMF Compare <emf.compare-inbox>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3
Version:	unspecified
Target Milestone:	Kepler
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Laurent Goubet

2012-01-24 07:53:53 EST

Recent developments have greatly improved the coverage of detection/merging use cases, but some of the "complex" use cases are still failing. I've commited a set of unit tests covering one of these use cases. Launch the org.eclipse.emf.compare.tests.merge.complexunmatch.suite.ComplexUnmatchedMergeTestSuite for examples of these failures. This suite is still commented out from the "main" test suite in order not to break the build.

The use case covered by this bug is the case of a reference towards an element that is contained under an unmatched element (for exemple, a class "A" contained in the package "P1" is used as the supertype of another class "B" from package "P2", while "P1" does not exist in one of the two models).

Comment 1 Laurent Goubet

2012-03-06 10:27:16 EST

I uncommented the test and set it as "ignored" instead. At least it will be reported even though the build will be "stable".

Comment 2 Laurent Goubet

2013-01-18 07:53:01 EST

Stream 2.* is much more stable wrt the merge process. This particular example is one that no longer fails in 2.1.