branchdiff
Compare two branches and determine differences between repositories and files. You can only diff branches that are in the same mainline branch and have at least one repository in common.
sscm branchdiff [-bBranchName1] BranchName2 [-pRepository] [-r|-r-] [-i] [-c] [-d] [-k] [-j] [-w] [-lUnified|-lContext] [-nLines]] [-h] [-y[Username:Password|+|=]] [-zSCMServerAddr:PortNum|zPath] [+u]
Option | Description |
---|---|
-b | First branch to diff. If not specified, default working directory branch is used. |
BranchName2 | Second branch to diff. |
-c | Do not display changed files. |
-d | Include file differences report in output. |
-h | Display online help for the command. |
-i | Do not display identical files. |
-j | Ignore case differences in differences report. Can only be used with -d. |
-k | Ignore blank lines in differences report. Can only be used with -d. |
-l | Output format of differences report: unified or context. Can only be used with -d. |
-n | Number of context output lines. Can only be used with -d. |
-p | Mainline branch or full repository path, including parent repositories. If not specified, the mainline branch or repository for the current working directory is used. |
-r | Recursively display all repositories and files. |
-w | Ignore all whitespace in differences report. Can only be used with -d. |
-y | Enter a Surround SCM username and password if you do not want to use the default value. To use single sign-on, enter -y+. If you use an identity provider to authenticate, the provider web page opens if you have not yet authenticated. Authenticate with the provider and then return to the CLI. |
-z | Enter the Surround SCM Server host computer address and port number if you do not want to use the default value. IPv6 addresses must be in square brackets. If you received a server settings file from your Surround SCM administrator, enter the path to the XML file instead of entering the server connection information. |
+u | Display output in Unicode (Windows only). Output cannot be sent to a file. If output is enabled for all commands, enter +u- to disable it for this command. |