p4 integrated
Synopsis
Show integrations that have been submitted.
Syntax
p4 [g-opts
] integrated
[-b branchname
[-r]]
file
…
Description
The p4 integrated command shows the integration history of the selected files, in the format:
file
#revision-range
- integrate-action
partner-file
#revision-range
where:
-
file
is the file argument provided to p4 integrated; -
partner-file
is the file it was integrated from or into; and -
integrate-action
describes what the user did during the p4 resolve process, and is one of the following:Integrate Action
What the User Did During the p4 resolve Process
branch from
file
did not previously exist; it was created as a copy ofpartner-file
.branch into
partner-file
did not previously exist; it was created as a copy offile
.merge from
file
was integrated frompartner-file
, acceptingmerge
.merge into
file
was integrated intopartner-file
, acceptingmerge
.moved from
file
was integrated frompartner-file
, acceptingtheirs
and deleting the original.moved into
file
was integrated intopartner-file
, acceptingtheirs
and creatingpartner-file
if it did not previously exist.copy from
file
was integrated frompartner-file
, acceptingtheirs
.copy into
file
was integrated intopartner-file
, acceptingtheirs
.ignored
file
was integrated frompartner-file
, acceptingyours
.ignored by
file
was integrated intopartner-file
, acceptingyours
.delete from
file
was integrated frompartner-file
, andpartner-file
had been previously deleted.delete into
file
was integrated intopartner-file
, andfile
had been previously deleted.edit from
file
was integrated frompartner-file
, andfile
was edited within the p4 resolve process. This allows you to determine whether the change should ever be integrated back; automated changes (merge from
) needn't be, but original user edits (edit from
) performed during the resolve should be.edit into
file
was integrated intopartner-file
, andpartner-file
was reopened foredit
before submission.add from
file
was integrated from a deletedpartner-file
, andpartner-file
was reopened foradd
(that is, someone restored a deleted file by syncing back to a pre-deleted revision and adding the file).add into
file
was integrated into previously nonexistentpartner-file
, andpartner-file
was reopened foradd
before submission.
If a file toFile
was ever integrated from a
file fromFile
, and both
toFile
and fromFile
match the p4 integrated
filepattern
argument, each integrated action is
listed twice in the p4 integrated output: once in its
from
form, and once in its
into
form, as described above.
If the optional -b
option is used, only files integrated from the source to target files in
the branch view are shown.
branch
If the optional -r
option is provided, the mappings in
the branch view are reversed. This option requires the use of the
-b
option.
branch
Options
|
Only files integrated from the source to target files in the branch view are listed. Qualified files are listed, even if they were integrated without using the branch view. |
|
Reverses the mappings in the branch view, swapping the target
files and source files. The |
|
See “Global Options”. |
Usage Notes
Can File Arguments Use Revision Specifier? |
Can File Arguments Use Revision Range? |
Minimal Access Level Required |
---|---|---|
No |
No |
|