blob: 15321c0fff39705b65ea99a7b5c5e6ace8ea34df (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
h1. EMF Compare User Guide
@Authors@ Cédric Brun
@Contact@ cedric.brun@obeo.fr
Copyright 2007-2010, Obeo (c)
{toc}
h2. Installation
To install EMF Compare you'll need to use either the <a href="http://www.eclipse.org/modeling/emf/updates/"> EMF update-site :</a>
or the build bits from the: <a href="http://www.eclipse.org/modeling/emf/downloads/?project=compare"> download page </a>
h2. Requirements
EMF Compare depends on:
# EMF runtime
# Eclipse Platform (if you don't want to run EMF Compare in "standalone mode").
h2. Configuration
h3. Activating EMF Compare on a given file extension
EMF compare uses a content-type to know whether it should be used for comparison. This content-type will initially register itself against .ecore and .uml files.
You may add your own extension using the Preferences view / Global / Content-types and adding your file extension in the "EMF Compare" content-type.
!images/ContentTypes.png!
h2. Usage
Once activated you can compare your file (locally or from any Configuration Management System supported by the Team API) using the @compare with@ menu in Eclipse.
!images/CompareUI.png!
The following areas are highlighted in the picture :
1. The diff model displaying all the differences found on the models
2. The version 1 model
3. The version 2 model
4. The "export differences" button
5. Move to next/Move to previous difference
6. Merge the current difference (left to right or right to left)
7. Merge all non conflicting differences (left to right or right to left)
8. Display properties differences
Note that some actions may be disabled depending on whether you are using VCS or not.
|
