Eclipse EMF Diff/Merge 0.7.0

Release Date
Deliverables

The built artefacts of the project comprise:

  • An EMF Diff/Merge runtime feature that includes:
    • A versatile diff/merge engine which is applicable to arbitrary sets of model elements.
    • Default GUI components for representing and merging differences.
    • An extension of the two to GMF models.
    • An integration of the whole with Eclipse Team mechanisms (local history, ...).
    • An integration of the whole with EGit.
    • An integration of the whole with Subversive (SVN).
  • An EMF Diff/Merge source feature that covers the same content as the runtime.
  • A Pattern SDK feature that includes runtime and source for:
    • An engine for creating, applying and reusing modeling patterns
    • A GUI that makes the former usable by end users in Eclipse-based modeling tools
  • A Pattern Sirius SDK customization feature that includes runtime and source for:
    • An extension of Pattern SDK which leverages Sirius technology for better usability and additional features.
  • A framework for merge-based model synchronization.

 

Compatibility

This project takes profit of the incubation phase to improve its API. Nonetheless, the project API has not been broken between this release and the previous one.

Internationalization

All user-level strings have been subject to the Eclipse string externalization mechanism.

Target Environments

The code has been tested on Java 1.5 to 1.8 on Windows XP and 7, 32 and 64 bits, from Eclipse Helios to Neon.

Themes

Difference categories

Difference categories and a dedicated GUI that supports filtering/focusing on categories (accessible via a tool button). Only basic categories are defined, the purpose of this feature is that categories are contributed according to the needs.

Model update GUI

A variant of the default GUI dedicated to source-to-target model update has been added. It is named DirectedComparisonViewer.

Model synchronization

A framework for model synchronization based on the merge mechanism, named Co-Evolution, is now available. It is not included in the update site but it is available at: http://wiki.eclipse.org/EMF_DiffMerge/Co-Evolution