accept

Purpose

The scm accept subcommand accepts change sets into a repository workspace. If you run it in a local workspace, the accepted change sets are also loaded into the local workspace.

Synopsis

• To run scm accept after you have used scm login to create stored credentials:

  scm accept  [ -r  |  --repository-uri ] repository URI or nickname [ -d  |  --dir ] workspace-path { [ [ -q  |  --quiet ] | [ -v  |  --verbose ] ] [ -s  |  --source ] source workspace or stream [ -t  |  --target ] target workspace or stream [ -i  |  --in-place-markers ] change set ... }

• To run scm accept supplying credentials on the command line:

  scm accept [ -r  |  --repository-uri ] repository URI [ -u  |  --username ] user ID in repository [ -P  |  --password ] password for user ID in repository
   [ -d  |  --dir ] workspace-path { [ [ -q  |  --quiet ] | [ -v  |  --verbose ] ] [ -s  |  --source ] source workspace or stream [ -t  |  --target ] target workspace or stream [ -i  |  --in-place-markers ] change set ... }

Options and arguments

[ -d  |  --dir ] workspace-path

The path name of a local workspace created by scm load or scm share. This subcommand runs with workspace-path set as the current working directory. You can omit this option if the current working directory is in a local workspace.

[ -i  |  --in-place-markers ]

When accepting files that have conflicts with files in the workspace, insert markers in the files to identify conflicted regions. This option modifies conflicted files to include marks of the following form:

<<<<<<< mine
Change in repository workspace before the accept
=======
Change from change set accepted into repository workspace
>>>>>>> proposed

After you have resolved the conflict, remove these markers, check in the file, and run scm resolve -c to complete the conflict resolution process.

[ -P  |  --password ] password for user ID in repository

The password for the specified user ID in the named repository. If this option is not included on the command line, you are prompted for a password. If you specified a repository URI or nickname for which you have stored credentials using the scm login command, this option is ignored.

[ -q  |  --quiet ]

Suppress most informational messages while operating.

[ -r  |  --repository-uri ] repository URI

Specifies the repository in which to take this action. If you have stored repository credentials using the scm login command, you can use the nickname you supplied for these stored credentials

[ -s  |  --source ] source workspace or stream

The name or UUID of the source workspace or stream.

[ -t  |  --target ] target workspace or stream

The name, alias, or UUID of the target workspace or stream.

[ -u  |  --username ] user ID in repository

Specifies a user ID that exists in the named repository. If you specified a repository URI or nickname for which you have stored credentials using the scm login command, this option is ignored.

[ -v  |  --verbose ]

Provide additional informational messages while operating.

change set ...

A space-separated list of one or more change sets to accept. Specify change sets by name, alias, or UUID. If omitted, all incoming change sets for the workspace are accepted.

Examples