Diffing One File Against Another

Unlike most other Diff Against operations, in which you choose which version of a file you want to diff, there are two Diff Against operations that allow you to diff one file with any other file you choose, Diff Against File in Other Stream and Diff Against File on Disk.

Diff Against File in Other Stream

Use this procedure when you want to diff two files that are under AccuRev control.

To diff a file against a file in another stream:

  1. In the File Browser, right-click the file you want to diff and choose Diff Against > File in Other Stream (or type Ctrl+Shift+O).

    AccuRev displays the Select File for Diff dialog box:

    Note that the file you selected is displayed in the instructional text.

  1. In the Streams field, select the stream or workspace associated with the file you want to diff against the file you selected in Step 1.

    The Stream Navigator is populated with a tree for the stream or workspace you select.

    If the file you chose for the Diff operation exists in the selected target stream, AccuRev automatically highlights the file in the Stream Navigator pane. You can choose a different file for the Diff operation, if appropriate.

    Note: To locate the file in the target stream, AccuRev navigates as much of the element’s path as possible. If AccuRev cannot find a file with the same name in the stream or workspace you select, it displays a warning message.

  1. Click Ok to diff the two files.

    AccuRev displays the Diff view. See Diff Tab Layout to learn about how diff files are displayed.

Diff Against File on Disk

Use this procedure when you want to diff a file under AccuRev control with any file on a local or networked disk.

  1. In the File Browser, right-click the file you want to diff and choose Diff Against > File On Disk (or type Ctrl+Shift+F).

    AccuRev displays the Open dialog box.

  1. Select the file against which you want to diff the file selected in Step 1 and click the Diff button.

    AccuRev displays the Diff view. See Diff Tab Layout to learn about how diff files are displayed.