Bug 510704 - Equivalent diffs are not all in conflict with ScalableConflictDetector engine
Summary: Equivalent diffs are not all in conflict with ScalableConflictDetector engine
Status: RESOLVED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 3.2.0   Edit
Hardware: PC Windows NT
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-01-19 11:16 EST by Laurent Delaigue CLA
Modified: 2017-01-25 03:04 EST (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Laurent Delaigue CLA 2017-01-19 11:16:21 EST
Steps to reproduce:

Use featuremapscope/containment/moveinandout models and compare them.

With the Default conflict detector, there is 1 conflict with 4 differences. With Scalable conflict detector, the conflict only contains 2 diffs (the feature map changes that are equivalent to the reference changes are not grouped in the conflict)
Comment 1 Eclipse Genie CLA 2017-01-20 10:21:23 EST
New Gerrit change created: https://git.eclipse.org/r/89228
Comment 3 Laurent Delaigue CLA 2017-01-25 03:04:11 EST
Merged in master today, targeting EMFCompare 3.3