You are here:

Viewing differences between repositories and working directories

You can diff a repository to see differences between Surround SCM and your working directory. You can also perform actions on files and repositories while viewing the differences.

Tip: If your working directory contains many changes and you want to update Surround SCM to match it, you can push changes to the repository to perform multiple actions at the same time. See Pushing changes to repositories.

1. Select the repository and choose Repository > Working Directory Differences.

The Working Directory Differences dialog box opens.

2. Click the display mode button to switch between tree view and list view.

3. Select Recursive to show all files in the repository and any subrepositories.

4. Select any Files to show options to control which files and repositories are included in the list.

Different contents shows files in the working directory that are different from the repository.
Different timestamps shows files in the working directory with a different timestamp than the repository. The file contents are the same.
Identical shows files that are the same in the working directory and repository.
Missing locally shows files and subrepositories in the repository that are missing from the working directory.
Missing from Surround SCM shows files and repositories in the working directory that have not been added to Surround SCM. If a filename or extension matches an excluded value and this option is selected, the file is shown if the Excluded by filename or extension option is also selected.
Excluded by filename or extension shows all files regardless of name or extension even if Surround SCM is configured to ignore some filenames and extensions when adding files. If a local file name or extension matches an excluded value and this option is selected, the file is displayed if the Missing from Surround SCM option is also selected.
In cloaked repositories includes files in cloaked repositories.

Note: Click Expand All to expand all repositories with differences. Click Collapse All to collapse all expanded repositories.

5. Select a file or repository and click a button to perform an action.

Button	Use to:	More information
Differences	Compare the current file version in Surround SCM with the copy in the working directory or another version to see the differences between them.	Viewing file differences
Merge	Merge the file in the working directory with the file in Surround SCM.	Merging files
View	View the file. You can view the local or Surround SCM file.
History	View the file or repository history.	Viewing file history and Viewing repository history
Properties	View the file or repository information.	Viewing file properties and Viewing general repository information
Get	Retrieve a copy of the file or repository to the working directory.	Getting files
Add	Add the file or repository to Surround SCM.	Adding files to Surround SCM
Check In	Check in the file.	Checking in updated files
Shelve	Shelve the file or repository.	Shelving files
Remove	Delete the missing file or directory from the working directory. If you select a local file or directory, you are prompted to confirm the deletion. If you select a server file or repository, the Remove Files or Remove Repository dialog box opens.	Removing files and Removing repositories
Resolve Missing	Resolve file differences if a file or repository was moved or renamed. Ctrl+click the old and new item and then click Resolve Missing.	Resolving missing moved and renamed items

6. Click Save As to save the differences list or click Print to print it.

7. Click Close when you finish.