You are here: Managing Repositories > Viewing differences between repositories and working directories

Viewing differences between repositories and working directories

You can diff files in a repository to check for differences between server files and files in your working directory. You can also perform actions on files while viewing the differences.

Tip: If your working directory contains a large number of changes and you want to update Surround SCM to match the contents and structure, 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 any options to control which files are displayed.

Recursive displays all files in the repository and any subrepositories.
Show changed files displays files that are modified or have a different timestamp in the working directory.
Show identical files displays files that are the same in the repository and working directory.
Show files excluded by file name or extension displays all files regardless of name or extension. Surround SCM may be 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 Show files not in Surround option is also selected.
Show missing local files displays missing local files.
Show files not in Surround displays files that have not been added to Surround SCM. If a file name or extension matches an excluded value and this option is selected, the file is displayed if the Show files excluded by file name and extension option is also selected.
Show files in cloaked repositories displays files in cloaked repositories.

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

4. Select a file and click a button to perform an action.

Button	Use to:	Additional information
Differences	Compare the file versions.	Viewing file differences
Merge	Merge the file versions.	Merging files
View	View the file. You can view the local or server copy of changed files.
History	View the file history.	Viewing file history
Properties	View the file properties.	Viewing general file information
Get	Get a copy of the file.	Getting files
Add	Add the file to Surround SCM.	Adding files to Surround SCM
Check In	Check in file.	Checking in updated files
Shelve	Shelve the file.	Shelving files
Remove	Delete the file. 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 the 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

5. Select Save As to save the differences list or click Print to print it.

6. Click Close when you finish.

Additional documentation | Knowledgebase | Blog | Technical support