Skip to main content

Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

Jump to: navigation, search

Difference between revisions of "EMF Compare/Specifications/MergerEnablement"

(Created page with "= Evolution Specification: Disable merger = Current status is '''DRAFT''' == Preamble == ''Summary'': Propose a way for a use to disable/enable some mergers. _Relevant...")
 
 
(7 intermediate revisions by the same user not shown)
Line 1: Line 1:
 +
{{Template:EMF Compare Archive Notice}}
 +
 
= Evolution Specification: Disable merger  =
 
= Evolution Specification: Disable merger  =
  
Current status is '''DRAFT'''
+
Current status is '''ABANDONED'''
  
 
== Preamble  ==
 
== Preamble  ==
Line 30: Line 32:
 
ranking:10
 
ranking:10
  
description:TODO
+
description: This merger handles the merge of control and uncontrol operations.
  
 
* Reference change merger
 
* Reference change merger
Line 37: Line 39:
 
ranking:10
 
ranking:10
  
description:TODO
+
description: This merger handles the merge of (containment and cross) reference changes.
  
 
* Attribute change merger
 
* Attribute change merger
Line 44: Line 46:
 
ranking:10
 
ranking:10
  
description:TODO
+
description: This merger handles the merge of attribute changes.
  
 
* Pseudo conflict merger
 
* Pseudo conflict merger
Line 51: Line 53:
 
ranking:15
 
ranking:15
  
description:TODO
+
description: This merger handles the merge of pseudo conflictual changes (i.e. changes that occurs both on the remote and local side).
  
 
* Conflict merger
 
* Conflict merger
Line 58: Line 60:
 
ranking:15
 
ranking:15
  
description:TODO
+
description: This merger handles the merge of conflictual changes (i.e. remote and local changes that cannot be automatically merged).
  
 
==== UI preview ====
 
==== UI preview ====
 
   
 
   
 
  [[file:MergerPreferences.png]]
 
  [[file:MergerPreferences.png]]

Latest revision as of 12:50, 5 March 2014

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_

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

MergerPreferences.png

Back to the top