rebase
Rebase branches to merge changes from the parent branch down to the child branch. This ensures the child branch includes the most current files. To rebase specific files or repositories, see rebasefile.
sscm rebase ChildBranch [-bSnapshotBranch] [-ccComment|-cpCommentPath|-c-] [-h] [-lLabelSearch] [-mLabelApply] [-pRepository] [-s] [-tTimeStamp] [-v] [-aStateID] [[-qHelixALMConfigName][-iHelixALMUsername:HelixALMPassword] -dIssueNum1[:IssueNum2...] -xRequirementNum1[:RequirementNum2...] -oTestCaseNum1[:TestCaseNum2...]] -eExternalID1[:ExternalID2...] [-y[Username:Password|+|=]] [-zSCMServerAddr:PortNum|zPath] [+u]
Option | Description |
---|---|
ChildBranch | Child branch name. Enter @ to use default working directory branch. |
-a | StateID to search for. the latest file version in this state is retrieved. Use lsstate to find StateID. Cannot use with -l, -s-, or -v. |
-b | Snapshot branch to rebase from. Cannot use with -l or -t. If -b, -l, or -t are not specified, newest file versions in parent branch are rebased. |
-c | Enter a comment or the comment text file path. Enter -cc to prompt for comment, -cp to prompt for the comment file path, or -c- if a comment is not needed. CommentPath can be full path of a local text file, partial path if file is in a subdirectory of current directory, or file name if file is in current directory. |
-d | Helix ALM issue number to attach files to. |
-e | External issue to attach files to. |
-h | Display online help for the command. |
-i | Helix ALM username and password. |
-k | Ignore broken share warnings. |
-l | Label to search for. Matching files in parent branch are rebased to child branch. Cannot use with -b or -t. |
-m | Label to apply to rebased files in the child branch. |
-o | Helix ALM test case number to attach files to. |
-p | Mainline branch or Full path to repository, including parent repositories. |
-q | Helix ALM connection name. Use lsttdb to find connection name. |
-s | Skip server auto-merge. |
-t | Local timestamp to search for. Format: yyyymmddhh:mm:ss. Files with this timestamp are rebased to child branch. Cannot use with -l or -b. |
-v | Preview result of rebasing the branch. |
-x | Helix ALM requirement number to attach files to. |
-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. |