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

Bug 366948

Summary:	False Positive Conflict detection for mono-valued attribute
Product:	[Modeling] EMFCompare	Reporter:	Cedric Brun <cedric.brun>
Component:	Core	Assignee:	EMF Compare <emf.compare-inbox>
Status:	CLOSED FIXED	QA Contact:
Severity:	critical
Priority:	P3	CC:	laurent.goubet
Version:	1.3
Target Milestone:	---
Hardware:	PC
OS:	All
Whiteboard:
Bug Depends on:
Bug Blocks:	365285

Description Cedric Brun

2011-12-16 10:00:58 EST

Having left, right and ancestor, changing an mono-valued attribute (here a string) in a same way in left and right lead to a "false" detected conflict right now.

Comment 1 Cedric Brun

2011-12-16 10:01:35 EST

Tested in org.eclipse.emf.compare.tests.unit.diff.ThreeWayDiffTest.testNoConflictIfBothAreDoingTheSameThing()

Comment 2 Laurent Goubet

2012-03-06 08:58:49 EST

This has been fixed for 1.2.2