Results displayed for compare of three units

If the comparison includes a base unit, the Base Value column is added to the columns in the Attributes pane to create a base‑aware comparison. This type of comparison is used when a baseline for a IBM® Rational® Rhapsody® unit is needed.

For example, during a maintenance release the changed Rational Rhapsody unit files are checked in on a different branch and after the maintenance release changed unit files needs to be merged back to the main branch.

During this process, the developer finds it easier to make decisions if the two unit files versions are compared the base (common ancestor) version. The developer can scroll through any non‑trivial differences (described in Trivial versus non-trivial differences) by using the Next Conflict button Next Conflict button and the Previous Conflict button Previous Conflict button.

In a three-unit compare, in addition to the standard browser symbols, both the browser and the Attributes pane include an additional Diff icon column with visual representations of each difference located in the base‑aware comparison. For definitions of the Diff icons, see Displaying differences in the Output window.

When comparing two units, triangle overlays are displayed in the browser items whether two or three units were compared. If you want to display the triangles on the icons indicating whether the difference is on the right, left, or both sides of the comparison, set the ShowDMMarksinBaseAwareMode preference to be Checked. For more information about this preference, see General preferences category.

To recognize difference categories icons:

In the Diff column in base‑aware comparisons, the icons illustrate the types of differences between the two units and the base. Move your mouse over an icon to see a definition for it.

To recognize the basic design features of these icons:

To recognize the icons and what they mean:


Feedback