Bug 510239 - ADD/ADD conflicts with children pseudo-conflicts lose children when merged
Summary: ADD/ADD conflicts with children pseudo-conflicts lose children when merged
Status: ASSIGNED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 3.3.0   Edit
Hardware: PC Windows NT
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Laurent Delaigue CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-01-11 04:48 EST by Laurent Delaigue CLA
Modified: 2017-01-20 10:21 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 Laurent Delaigue CLA 2017-01-11 04:48:53 EST 
To reproduce, compare files in /org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/conflictscope/leftadd_rightadd/ 

It contains a conflict ADD/ADD with a child pseudo-conflict.

When merging to solve the conflict, the child node never gets added.

This regression seems to have been introduced in the summer 2016 while refactoring the management of conflicts: Previously, the pseudo-conflict wasn't there and all the diffs were part of the same real conflict.

Maybe a way to solve this is to change the behavior of the merger to move the existing object in the right location when merging, instead of deleting it and recreating it in the right place.
We must also check with the other kinds of conflicts and children whether other regressions have been introduced.
Comment 1 Eclipse Genie CLA 2017-01-20 10:21:28 EST 
New Gerrit change created: https://git.eclipse.org/r/89229