The Diff-Merge tool

Introduction to the Diff-Merge tool

The Objecteering Diff-Merge tool is used to:

· compare two Objecteering models

· display the differences between the two models

· merge the two models if desired

· only merge a part of a model

When a comparison ("diff") is run, elements from one model are compared with elements from another model, which have the same site identifier.

Only NameSpace and ClassifierOccurence elements can be compared. For all other elements, the Diff-Merge tool considers them as elements which have been created or deleted.

Diffs can be based on a common ancestor model, in other words, an Objecteering model which the two models to be merged result from.

If a diff not based on an ancestor model is run, the following types of difference are presented:

· an element has been modified in both models

· an element has been added to one of the models

· the order of elements is different between the two models

· an element has been moved in one of the models

If a diff is based on an ancestor model, the differences presented are:

· an element has been modified in both models

· an element has been added to one of the models

· an element has been deleted from one of the models

· the order of elements has been modified in one of the models

· an element has been moved in one of the models

The Diff-Merge tool is available with the Objecteering Multi-user, Objecteering ClearCase, Objecteering SCC and Objecteering Dimensions MDACs.

It is not available with the Objecteering CM Synergy MDAC.

Using the Diff-Merge tool

To use the Diff-Merge tool, either the Objecteering Multi-user, the Objecteering ClearCase, Objecteering SCC or the Objecteering Dimensions MDAC must have already been deployed in your project.

The "Diff-Merge models" command is available in the Multi-user, ClearCase, SCC and Dimensions context menus, simply by right-clicking (as shown in Figure 31 below).

Figure 31. Running the "Diff-Merge models" command

Steps:

1. Right-click to display the Multi-User, ClearCase, SCC or Dimensions context menu.

2. Run the "Diff/Merge models" command.

This operation opens the first window of the Diff-Merge wizard. For details on this wizard, please see the following sections:

o the "Objecteering Multi-user commands" section, if you are using the Objecteering Multi-user MDAC

o the "Objecteering ClearCase commands" section, if you are using the Objecteering ClearCase MDAC

o the "Objecteering SCC commands" section, if you are using the Objecteering SCC MDAC.

o the "Objecteering Dimensions commands" section, if you are using the Objecteering Dimensions MDAC

Using the Diff-Merge tool in Client-Server mode

If you have a client-server installation and you want to run a Diff-Merge operation on a database situated on a client other than your own, the database in question must first be received on their site.

Diff-Merge operations on notes

If an external tool is used when merging notes, a header is added at the beginning of each note when the external tool is opened. This header, which will not appear in the note itself, you MUST NOT be modified. If it is modified, and is therefore different when the external tool is closed, all the text will appear in the note, including the modified header.