p4 resolved

Synopsis

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.

Although the name p4 resolved seems to imply that only files that have gone through the p4 resolve process are listed, this is not the case. A file is also considered to be resolved if it has been opened by p4 integrate for branch, opened by p4 integrate for delete, or has been resolved with p4 resolve.

Options

-o

Output the base file name and revision that was used during the resolve.

g-opts

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

open

Related Commands

To see a list of integrations that have been submitted

p4 integrated

To view a list of integrations that have not yet been resolved

p4 resolve -n

To schedule the propagation of changes from one file to another

p4 integrate

To resolve file conflicts, or to propagate changes as scheduled by p4 integrate

p4 resolve