Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 366948 - False Positive Conflict detection for mono-valued attribute
Summary: False Positive Conflict detection for mono-valued attribute
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 1.3   Edit
Hardware: PC All
: P3 critical (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 365285
  Show dependency tree
 
Reported: 2011-12-16 10:00 EST by Cedric Brun CLA
Modified: 2012-03-06 08:58 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Cedric Brun CLA 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 CLA 2011-12-16 10:01:35 EST 
Tested in org.eclipse.emf.compare.tests.unit.diff.ThreeWayDiffTest.testNoConflictIfBothAreDoingTheSameThing()
Comment 2 Laurent Goubet CLA 2012-03-06 08:58:49 EST 
This has been fixed for 1.2.2