diff
Compares two states of a file or set of files and displays the differences between them. Comparing files: When you select a file, the version of the file on disk is used as the after state. By default the before state is the before state of the most recent change. Comparing change sets: When you select a change set, by default all changes made in that change-set will be displayed. Comparing workspaces or streams: When you select a workspace or stream, the default before state is the selected workspace's or stream's current collaboration. Comparing snapshots: When you select a snapshot, the default "before" state is the workspace or stream that is associated with the snapshot. Comparing baselines: When you select a baseline, the default "before" state is the previous baseline in the history.
| Usage: scm diff | [common options] [-N/--no-local-refresh] [-w/--workspace <arg>] [-c/--component <arg>] [[-x/--xcompare] [-S/--show <arg>] | [-p/--fullpatch]] [-m/--maximum <arg>] [-f/--file <arg ...>] <after-type> <after-selector> [before-type] [before-selector] |
|---|
| after-type | Type of the item to use for the after state (file, workspace, stream, baseline, change set, snapshot). |
|---|---|
| after-selector | Selector of the item to use for the after state (name[@repo], alias, or UUID[@repo]). If after-type is file, then use only the path of the file on disk. |
| before-type | Type of the item to use for the before state (workspace, stream, baseline, change set, snapshot). |
| before-selector | Selector of the item to use for the before state (name[@repo], alias, or UUID[@repo]). |
Options:
| -r, --repository-uri <arg> | The URI that specifies the location of the repository. |
|---|---|
| -u, --username <arg> | The user name for the repository. |
| -P, --password <arg> | The password for the repository. |
| --password-file <arg> | File that contains the user's password. |
| --certificate <arg> | The file that contains the user's login certificate. |
| --smartCard | Use the connected smart card for authentication. |
| --kerberos | Authenticate with Windows user credentials using Kerberos/SPNeGO. |
| --integratedWindows | Authenticate with Windows user credentials using Integrated Windows Authentication. |
| -d, --directory <arg> | Specifies the root of the shared file system. |
| -N, --no-local-refresh | Does not scan the file system for new changes. This option overrides the value of the 'refresh.local.changes' preference. To see the current value of this preference, run 'lscm get preference refresh.local.changes'. |
| -w, --workspace <arg> | The workspace that contains the change set. To specify the workspace, use its name[@repo], alias, or UUID[@repo]. |
| -c, --component <arg> | The component to select when you compare workspaces, streams, snapshots, or baselines. The component is identified by a name, alias, or UUID. This option is required when you specify a baseline by name; otherwise, this option is optional. |
| -x, --xcompare | Opens an external compare tool that is configured in the preferences. This option only applies when the type is file and the tool will only show content differences. |
| -S, --show <arg> | Indicates whether to display the differences in content, properties, or both. Use "c" for content, "p" for properties or "cp" for both. By default, differences in content is shown. |
| -p, --fullpatch | Produces a full Jazz patch. |
| -m, --maximum <arg> | The maximum number of change sets that can be returned. The number must be greater than 0. If you omit this option, 512 is used by default. If you specify "all"/"-" then the entire difference is displayed. |
| -f, --file <arg ...> | Show the differences for a set of files within the specified before or after selector. Specify the alias, UUID or path of the files. |
Example