Using the Folder Diff Utility
To display the differences in the contents of two folders, you can diff them. For example, after working offline, you can diff your workspace with the depot to determine how to submit your changes so that your workspace and the depot are consistent. To display the changes made to a folder over time, diff two versions of the same folder. The Folder Diff utility offers show/hide options that enable you to list only files of interest.
To diff folders:
-
Select two folders in the depot or workspace pane.
You can also select one folder and enter the second folder directly in the Diff dialog.
- Context-click and choose Diff Against…​.
- In the Diff dialog, specify the paths and versions of the folders you want to compare.
- Click Diff to launch the Folder Diff utility.
-
The Folder Diff utility lists the subfolders and files in both diffed folders, side-by-side.
Differences are highlighted as follows:
Violet highlight indicates content difference in file or subfolder.
Ivory highlight indicates file is present in only one of the two folders.
You can select from among the following display options (most of these can be used in combination):
Shows file pairs with identical content.
Shows unique files, with no counterparts in the other folder.
Shows file pairs with content differences.
Filter the files that are displayed. Click to select a saved filter or to create a filter using the Filter dialog. You can filter by filename (or part of a filename) and folder path. For more information about P4V filters, see Searching and Filtering.
Go to previous or next diff.
Show files in a tree hierarchy.
Show files as list.
You can view details about a file by selecting it. The selected file is highlighted in a darker hue. File details appear in the following tabs below the diff windows:
- Details
- Integrations
- Labels
-
Preview
You can also view a brief description of the latest change to any file by placing your mouse over the file icon.