Diffing Folders

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 version of the same folder. The Folder Diff utility offers show/hide options that enable you to list only files of interest.

To diff folders:

  1. Select two folders in the depot or workspace pane
  2. Context-click and choose Diff Against... The Diff dialog is displayed.
  3. Specify the paths and versions for the folders you want to compare and click Diff. The Folder Diff window is displayed. The tabs in the bottom panes display detailed information about selected files and folders.

 

Orange highlight indicates selected file
Violet highlight indicates content difference
Ivory highlight indicates file is present in only one of the two folders
Goes to previous or next diff