Viewing shelved file differences

You can diff shelved files to compare, accept, or reject differences between the file stored in the shelf and the file in another location.

You cannot diff shelved files that are not yet under source control.

1. Choose View > Shelves.

The Shelves window opens.

2. Select a shelved file and click Differences.

The Differences dialog box opens. Read-only information is displayed in the First File area.

3. Select a Second File option.

Server version of the shelved file compares the shelved file with the current file version in Surround SCM.
Copy in working directory for branch compares the shelved file with the file in the working directory for the selected branch.
Branched file compares the shelved file with branched version. Select a file from list.

4. Click Differences.

The differences application opens.