0.6.0
EMF Diff/Merge is a diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components and sample higher-level tools, such as support for modeling patterns, are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
This is the Neon release of EMF Diff/Merge. It includes contributions related to the integration with Eclipse Team and Eclipse SCM clients (EGit, Subversive).
The project leadership certifies that the APIs in this release are "Eclipse Quality".
The EMF Diff/Merge technology is made of two update sites/dropins:
-
A core EMF Diff/Merge update site that provides:
- A diff/merge engine. This component can be customized/extended via model scopes (what to compare), match and diff policies (how to compare) and merge policies (how to merge). This component also integrates with Eclipse Team.
- A GUI component which relies on the engine. This component provides an extension point which allows specifying engine customizations that are made available in the GUI. It comes with a simple customization for GMF scopes (diagrams and models) that illustrates the overall extendibility of the technology.
- Integration features with Eclipse SCM clients: Git and SVN.
-
A "Pattern" update site which relies on the update site above. It contains two features:
- A tool that provides support to modeling patterns that can be defined in terms of diff/merge.
- An extension of this tool for Sirius environments.
No security issue identified.
The complete EMF Diff/Merge documentation is available from the EMF Diff/Merge Wiki page:
- General information (Introduction, Context and issues, Tool overview, Principle of the solution)
- Usage: Programmatic and via default GUI
- Complete javadoc
- Applications and Documents
- Download information
- Useful links
Among the applications mentioned, one refers to the wiki page dedicated to Modeling Patterns, which is structured similarly to the main page.
EMF Diff/Merge intends to conform to the User Interface Guidelines.
No EMF Diff/Merge component is deprecated so far.
EMF Diff/Merge does not implement any standard.
EMF Diff/Merge obtained the "Most innovative project/feature" award at EclipseCon NA 2013. The forum, bugzilla and Gerrit show regular activity by different people and organizations. Several Gerrit pull requests have been submitted by people external to the project. EMF Diff/Merge is known to be distributed within modeling tools such as Polarsys Capella or Intel Cofluent Studio.
A joint talk by Atos, Intel and Thales was given at EclipseCon France 2015: Transformations, Patterns, Version Control: Where there is modeling, there is merging. An ignite talk will be given by Intel at EclipseCon France 2016.