Diff Against

The Diff Against command lets you compare two versions of a text file. It is available in the File Browser, History Browser, and change package entries on the Issues and Changes tabs. See Using AccuWork for more information about issues and change packages.

You can compare file versions in the following contexts:

• Against the backed or basis version, via the File Browser.
• Against the basis version, via the Issue Edit form's Changes Subtab.
• Against the basis version, via an issue's Change Package (see Working in the Changes Subtab).
• Against any other version in the file's transaction history, via the History Browser’s Summary pane.
• Against the previous version in the file's transaction history, via the Versions pane in the History Browser and Stream Transactions tab.
• Against the current version in the file's transaction history, via the Annotate command.

In addition, AccuRev provides two Diff Against > Overlapping Changes options to help you identify and resolve conflicts between two versions of an element that result in an (overlap) status:

Mine

Compares your workspace version against the common ancestor in the backing stream. This option identifies the changes in your workspace that did not come from the backing stream. It is the equivalent of diffing against the last version that you merged with.

Theirs

Displays only the changes added to the backing stream since the last time you merged with the backing stream. This option is useful for identifying the changes to the backing stream that caused the overlap condition.

The Overlapping Changes options are available only for elements with an (overlap) status.

Once you choose the versions you want to compare, the results are displayed in the Diff tab.