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
and the 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:
- No difference element means
the element, including all its nested elements, is identical on both
sides of the comparison. In the browser, a no difference element has
the same icon as inRational Rhapsody
.
- Right-only element means
that the element exists only on the right side of the comparison.
For example, the element is new or was deleted from the left unit.
In the browser, a right‑only element has a left‑facing, green arrow
overlaid on the icon
.
- Left-only
element means
that the element exists only on the left side of the comparison. For
example, the element is new or was deleted from the right unit. In
the browser, a left‑only element has a right‑facing, blue arrow overlaid
on the icon
.
- Difference
element means
that the element exists in both sides of the comparison, but some
of its fields or properties are different. In the browser, a difference
element has dual‑facing, red arrows overlaid on the icon
.
- Nested
difference means
that the element exists on both sides of the comparison, but some
of its subelements are different. There is no two‑unit comparison
icon for the Nested difference, but there is a Nested difference icon
in a base‑aware comparison.
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:
- Modification on the right side
with a blue triangle
(pointing right)
- Modification on the left with
an orange triangle
(pointing left)
- Deletions have a minus sign
on the side that has
the deleted item
- Additions have a plus sign
on the appropriate side
To recognize the
icons and what they mean:
- The item contains
at least one nested difference
.
- The
item was modified on both sides of the comparison
.
- The
item was modified on the left and deleted on
the right
.
- The
item was added to the left side only
.
- The
item was modified on the left side
.
- The
item was modified on the right side
.
- The
item was deleted from the right side
.