Moved and renamed files and repositories are treated as unique items. When diffing working directories, Surround SCM displays local and server copies of the same item as missing. For example, if a file was moved from one working directory to another, the server copy is displayed as missing locally and the local copy is displayed as missing on server. If you have move and rename security permissions, you can perform one action to resolve differences between moved and renamed items, and maintain historical information for both items.
Note: You can only resolve one difference. If an item was moved and renamed, you must manually resolve the separate actions.
Resolving moved item differences
1. In the Working Directory Differences dialog box, Ctrl+click the original and moved items.
2. Click Resolve Missing.
3. Click Move Local to move the local copy to a different directory or click Move Server to move the server copy to a different repository.
Resolving renamed item differences
1. In the Working Directory Differences dialog box, Ctrl+click the original and renamed items.
2. Click Resolve Missing.
3. Click Rename Local to apply the server copy name to the local copy or click Rename Server to apply the local copy name to the server copy.