p4 resolved
Display a list of files that have been resolved but not yet submitted.
Syntax
p4 [g-opts] resolved [-o] [file ...]
Description
p4 resolved lists files that have been resolved, but have not yet been submitted. The files are displayed one per line in the following format:
localFilePath - action from depotFilePath#revisionRange
where localFilePath is the full path name of the
resolved file on the local host, depotFilePath is the
path of the depot file relative to the top of the depot,
revisionRange is the revision range that was
integrated, and action is one of merge,
branch, or delete.
If file pattern arguments are provided, only resolved, unsubmitted files that match the file patterns are included.
This output lists all files that are:
-
opened by
p4 integrateforbranch -
opened by
p4 integratefordelete -
resolved with
p4 resolve
Options
|
|
Output the base file name and revision that was used during the resolve. |
|
|
See Global options. |
Usage Notes
| Can File Arguments Use Revision Specifier? | Can File Arguments Use Revision Range? | Minimal Access Level Required |
|---|---|---|
|
N/A |
N/A |
|
Related Commands
|
To see a list of integrations that have been submitted |
|
|
To view a list of integrations that have not yet been resolved |
|
|
To schedule the propagation of changes from one file to another |
|
|
To resolve file conflicts, or to propagate changes as scheduled
by |
