By default, the following options are available. The advanced ' Matching' tab provides options that determine the way elements are matched. However, additional options may be available in specific modeling tools. The subsections below describe the options that are provided by default. Additional tabs become visible as in the figure below. If the needs are not covered by these predefined configurations, it is possible for an advanced user to switch to the advanced configuration mode by clicking the ' Show advanced settings' button. ' Transfer of elements between models created independently': Use this configuration if you need to transfer elements between models that are historically unrelated but structured in a similar way.Īdditional configurations may be available in specific modeling tools.It assumes every model element has a unique identifier, either through a dedicated property or through persistence (for example, XML or XMI IDs). ' Diff/merge between different versions of the same model': Use this configuration for a classic diff/merge between different versions of the same model.The radio buttons correspond to predefined configurations that reflect common use cases. With the default comparison method, the configuration dialog looks like the one below. The ' Configure.' button in the setup dialog makes it possible to change the way a comparison is computed: how elements are being matched, what differences are detected and how they can be merged, what extra information is provided. If the user selects three files, the comparison proposes to compare two files taking into account a third common ancestor as illustrated below. Other methods can be added via extensions of the diff/merge tool. A default, configurable comparison method that is suitable, e.g., for version control is available. The ' Comparison method' combo box allows selecting the way models are compared.If 'Any' is chosen, then the comparison is represented in a symmetric way and both models can be modified. These radio buttons have an impact on the 'Modifiable' check boxes. The ' Merge direction' radio buttons specify the direction of the merge, i.e., which model is the source of changes and to which model the changes can be applied.This is a way to protect a model against accidental changes due to a wrong usage of the tool. If a check box is unselected, it will not be possible to carry out merge actions which would modify the corresponding model. The ' Modifiable' check boxes allow defining which model(s) can be modified.The ' up-and-down-arrows' button on the right can be used to swap the position of models - left or right - in the tool, for convenience.Whenever the menu item is clicked, a setup dialog involving the selected files is shown. It can also be used on model-based diagrams (GMF files, or Sirius *.aird files for example) or model fragments. This menu item is enabled when two model files are selected in the Project Explorer as illustrated in the figure below.
The GUI is accessible via the 'Compare With' - 'Each Other as models' popup menu item.
Other technological usages of EMF Diff/Merge as well as complementary technical documentation are available online on the EMF Diff/Merge wiki. The GUI supports setting up and configuring comparisons, visualizing differences and selectively merging those differences. This document explains how users can use the GUI to compare and merge models manually. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or integration with Version Control Systems.Ī GUI is also provided for a classical usage within Eclipse. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. EMF Diff/Merge is a diff/merge technology for models.
0 kommentar(er)
