Jump to: navigation, search

Difference between revisions of "EMF DiffMerge"

(Introduction)
Line 19: Line 19:
 
The EMF Diff/Merge project is part of [http://www.eclipse.org/projects/project.php?id=modeling.emf EMF].<br>  
 
The EMF Diff/Merge project is part of [http://www.eclipse.org/projects/project.php?id=modeling.emf EMF].<br>  
  
[[Image:MainOverview.png|center]]
+
[[Image:MainOverview.png|center]]  
  
 
== Usage  ==
 
== Usage  ==
  
 
*[http://wiki.eclipse.org/EMF_DiffMerge/Programmatic_Usage Programmatic usage and concepts]  
 
*[http://wiki.eclipse.org/EMF_DiffMerge/Programmatic_Usage Programmatic usage and concepts]  
*[http://wiki.eclipse.org/EMF_DiffMerge/Default_GUI Default GUI]<br>
+
*[http://wiki.eclipse.org/EMF_DiffMerge/Default_GUI Default GUI]<br>  
 +
*[https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/javadoc/ Javadoc]
  
== Download<br> ==
+
== Download<br> ==
  
 
*Via the update site:&nbsp;[https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/site.p2/ https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/site.p2/]  
 
*Via the update site:&nbsp;[https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/site.p2/ https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/site.p2/]  
 
*Or as [https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/dropins/*zip*/dropins.zip dropins]
 
*Or as [https://hudson.eclipse.org/hudson/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/dropins/*zip*/dropins.zip dropins]
  
The tool has been tested with Juno, Indigo and Helios (Eclipse Modeling 4.2, 3.7 and 3.6).
+
The tool has been tested with Juno, Indigo and Helios (Eclipse Modeling 4.2, 3.7 and 3.6).  
  
 
== Links<br>  ==
 
== Links<br>  ==

Revision as of 07:58, 3 August 2012

Introduction

Merging models is a common need in model-based activities, not only for version control but for model manipulation in general. However, merging models is much more complex than merging source code. Since EMF models are rich data structures with constraints and behavior, merging them consistently is a delicate problem.

EMF Diff/Merge aims to help solve that problem. The scope of EMF Diff/Merge covers:

  • A lightweight, configurable engine for comparing and merging EMF models in 2-way and 3-way (with common ancestor) configurations.
  • Matching of model elements by ID, where an ID can be any "signature" that uniquely identifies the element within its scope: Ecore ID, XML ID, qualified name, location in model tree, etc.
  • A simple GUI with reusable UI components.

The tool is intended to satisfy the following requirements:

  • It must support the comparison and merge of large models (scalability, reliability).
  • The order in which differences are merged must have no impact.
  • The consistency of the model being merged must be preserved whenever possible, by automatically merging interdependent differences together.

The final goal is to obtain a mature, versatile software building block for multiple usages: version control, incremental model transformations, model refactoring, etc.

The EMF Diff/Merge project is part of EMF.

MainOverview.png

Usage

Download

The tool has been tested with Juno, Indigo and Helios (Eclipse Modeling 4.2, 3.7 and 3.6).

Links