      |
|
Diff utility for comparing workspace content to depot content. (For comparing two depot paths, see p4 diff2.)
p4 [g-opts] diff [-doptions] [-f -t -Od] [-m max] [-soptions] [file[rev] ...]p4 diff runs a diff program on your workstation that
compares files in your workspace to revisions in the depot.
This command takes a file argument, which can contain a revision specifier.
edit, or the
comparison must be against a revision other than the one to which the
client file was last synced.If the file argument includes wildcards, all open files that match the file pattern are diffed.
If no file argument is provided, all open files are diffed against their depot counterparts.
By default, your workstation runs the diff routine built into the
p4 command-line application. You can make your workstation run an external diff program by setting the P4DIFF environment variable to
point to your external diff program.
|
|
Pass options to the underlying diff routine (see Usage Notes for details). |
|
|
Force the diff (if no revision is specified, against the head
revision), even when the client file is not open for
|
|
|
Limit output to diffs (or status) of only the first
|
|
|
Limit output to only those files that differ. |
|
|
Pass display options to the underlying diff routine (see Usage Notes for details). |
|
|
Diff the revisions even if the files are not of type
|
|
|
See Global Options. |
| Can File Arguments Use Revision Specifier? | Can File Arguments Use Revision Range? | Minimal Access Level Required |
|---|---|---|
|
Yes |
No |
|
The -d
supported by optionsp4 diff are:
| Option | Name |
|---|---|
|
|
ignore changes made within whitespace; this option implies
|
|
|
context output format, showing line number ranges and
|
|
|
ignore line-ending (CR/LF) convention when finding diffs. |
|
|
RCS output format, showing additions and deletions made to the file and associated line ranges. |
|
|
summary output format, showing only the number of chunks and lines added, deleted, or changed. |
|
|
unified output format, showing added and deleted lines with
|
|
|
ignore whitespace altogether; this option implies
|
The -s
supported by optionsp4 diff are:
| Option | Name |
|---|---|
|
|
Show only the names of opened files that are different from the revision in the depot, or are missing. |
|
|
Show only the names of files opened for integrate that have been resolved, but that have been modified after being resolved. |
|
|
Show only the names of unopened files that are missing from the client workspace, but present in the depot. |
|
|
Show only the names of unopened files in the client workspace that are different than the revision in the depot. |
|
|
Every unopened If you use the |
|
|
Show only the names of opened files in the client workspace that are identical to the revision in the depot. |
To pass more than one option to the diff routine, group them together. For example:
p4 diff -dub file
specifies a unified diff that ignores changes in whitespace.
-du
option for use with patch(1) displays filenames in
Helix Server
syntax, not local syntax.-s options compare the file(s) regardless of whether they
are opened in a changelist or the workspace has been synced to the
specified revision.|
|
Compare the client workspace revision of file |
|
|
Compare all open files in the client workspace to the revisions in the depot as of midnight on May 22, 2017. |
|
|
Limit to the first 10 files the comparison all open files in the client workspace to the revisions in the depot as of midnight on May 22, 2017. |
|
|
Run the comparison on file |
|
|
Revert all open, unchanged files. This differs from The first command shows all open, unchanged files. The second
command (running (This UNIX version of this command uses a pipe. Most operating systems have a similar way of performing these operations in series). For more information about the |
|
To compare two depot revisions |
|
|
To view the entire contents of a file |
| |
|