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

Bug 429210

Summary: Provide a safer IMerger interface to prevent partial merge differences.
Product: [Modeling] EMFCompare Reporter: Arthur Daussy <arthur.daussy>
Component: CoreAssignee: EMF Compare <emf.compare-inbox>
Status: RESOLVED WONTFIX QA Contact:
Severity: normal    
Priority: P3    
Version: 3.0.0   
Target Milestone: Luna   
Hardware: PC   
OS: Linux   
Whiteboard:
Bug Depends on: 42970    
Bug Blocks:    

Description Arthur Daussy CLA 2014-02-27 03:09:53 EST 
Since the implementation of configuration in EMF Compare, merger can be disabled. With this come a new use case: No merge is available for a merge action.
For simple merge action (attributes, references etc...) it is simple to prevent a merge action if no merge is available. However for composite merger such as Conflict merger , it's impossible before the action to say if the merge will be able to perform completely its action. 
For example with a composite merger with N level. If at the N level we do not have any merger available to merge the current conflict then the merge action shall be able to rollback. (See bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=406101). 
To prevent this use case we need to be able to say if the merge action can completely run. The solution is a new IMerger interface that will able to provide such information.

Regards
Comment 1 Arthur Daussy CLA 2014-03-03 04:36:19 EST 
Not needed anymore.
Comment 2 Arthur Daussy CLA 2014-03-03 05:00:06 EST 
Closing because depending bug has been closed.