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

Bug 312178

Summary:	Intra-model references fail in CVS compare
Product:	[Modeling] EMFCompare	Reporter:	Ed Willink <ed>
Component:	Core	Assignee:	EMF Compare <emf.compare-inbox>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	laurent.goubet
Version:	2.6.0
Target Milestone:	---
Hardware:	PC
OS:	Windows Vista
Whiteboard:

Description Ed Willink

2010-05-09 05:46:43 EDT

M7.

A compare against CVS after adding one line (a new derived class) to /org.eclipse.ocl.examples.xtext.oclinecore/model/OCLinEcoreCST.ecore 1.3 reports 25 errors. The model has the following reference:

../../org.eclipse.ocl.examples.xtext.base/model/BaseCST.ecore#//PackageCS

requiring that the CVS model be resolved against another (possibly CVS) model.

In this scenario EMF compare reports 25 changes, the spurious changes all being due to the apparent use of null for the unresolved CVS elements.

Presumably EMF compare should leave external proxies unresolved so that they can be compared without activating 'deep' issues.

Comment 1 Laurent Goubet

2011-08-09 05:59:41 EDT

The match, diff and merge process have seen a great deal of improvement in the
past week, with the addition of unit tests for most of the different use cases
(one use case = one possible "diff" between models) we could think of.

The particular issue of proxy resolution is one of the things that has been tested and fixed. Could your verify whether you still reproduce with the latest integration builds?

These changes have been pushed on both master and the 1.2 maintenance stream.
They are available in the builds
 - 1.2 integration : I201108090404
 - 1.3 integration : I201108090415

Comment 2 Laurent Goubet

2012-03-06 04:14:08 EST

Closing this as worksforme since these issues should have been fixed last year.

Comment 3 Ed Willink

2012-03-06 04:48:21 EST

Surely this is resolved FIXED since the problem was genuine and went away as a result of ongoing progress.

Comment 4 Laurent Goubet

2012-03-06 04:53:49 EST

Ed,

I set this as "worksforme" since I never actually reproduce these issues before fixing them :). I can change the resolution if you'd rather, that's just a flag on bugzilla after all ^^.