Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
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...") |
(→Detailed Specification) |
||
| Line 30: | Line 30: | ||
ranking:10 | ranking:10 | ||
| − | description: | + | description: This merger handle the merge of control and uncontrol operations. |
* Reference change merger | * Reference change merger | ||
| Line 37: | Line 37: | ||
ranking:10 | ranking:10 | ||
| − | description: | + | description: This merger handle the merge of (containment and cross) reference changes. |
* Attribute change merger | * Attribute change merger | ||
| Line 44: | Line 44: | ||
ranking:10 | ranking:10 | ||
| − | description: | + | description: This merger handle the merge of attribute changes. |
* Pseudo conflict merger | * Pseudo conflict merger | ||
| Line 51: | Line 51: | ||
ranking:15 | ranking:15 | ||
| − | description: | + | description: This merger handle 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 58: | ||
ranking:15 | ranking:15 | ||
| − | description: | + | description: This merger handle the merge of conflictual changes (i.e. remote and local changes that can not be automatically merged). |
==== UI preview ==== | ==== UI preview ==== | ||
[[file:MergerPreferences.png]] | [[file:MergerPreferences.png]] | ||
Revision as of 06:15, 26 February 2014
Contents
Evolution Specification: Disable merger
Current status is DRAFT
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 handle the merge of control and uncontrol operations.
- Reference change merger
class:org.eclipse.emf.compare.merge.ReferenceChangeMerger
ranking:10
description: This merger handle the merge of (containment and cross) reference changes.
- Attribute change merger
class:org.eclipse.emf.compare.merge.AttributeChangeMerger
ranking:10
description: This merger handle the merge of attribute changes.
- Pseudo conflict merger
class:org.eclipse.emf.compare.merge.PseudoConflictMerger
ranking:15
description: This merger handle 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 handle the merge of conflictual changes (i.e. remote and local changes that can not be automatically merged).
UI preview
