EMF Compare/Specifications/MergerEnablement

THIS PAGE IS ARCHIVED. IT IS PROBABLY OUTDATED AND WILL NOT BE UPDATED

Evolution Specification: Disable merger

Current status is ABANDONED

Preamble

Summary: Propose a way for a use to disable/enable some mergers.

_Relevant tickets_

• [1]

Introduction

The same way engines can be disabled/enabled from preferences, EMFCompare shall propose a way to disable/enable mergers.

Detailed Specification

• To configure this the system shall provide an User Interface.
• The user shall be able to use this interface to modify at runtime which merger are enabled/disabled.
• This interface shall be provided in its own preference page.

Default contribution

• Resource attachment change merger

class:org.eclipse.emf.compare.merge.ResourceAttachmentChangeMerger

ranking:10

description: This merger handles the merge of control and uncontrol operations.

• Reference change merger

class:org.eclipse.emf.compare.merge.ReferenceChangeMerger

ranking:10

description: This merger handles the merge of (containment and cross) reference changes.

• Attribute change merger

class:org.eclipse.emf.compare.merge.AttributeChangeMerger

ranking:10

description: This merger handles the merge of attribute changes.

• Pseudo conflict merger

class:org.eclipse.emf.compare.merge.PseudoConflictMerger

ranking:15

description: This merger handles the merge of pseudo conflictual changes (i.e. changes that occurs both on the remote and local side).

• Conflict merger

class:org.eclipse.emf.compare.merge.ConflictMerger

ranking:15

description: This merger handles the merge of conflictual changes (i.e. remote and local changes that cannot be automatically merged).

UI preview