p4 integrated
Synopsis
Show integrations that have been submitted.
Syntax
p4 [g-opts] integrated [ -r ] [
-b branch ]
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:
-
fileis the file argument provided to p4 integrated; -
partner-fileis the file it was integrated from or into; and -
integrate-actiondescribes 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 fromfiledid not previously exist; it was created as a copy ofpartner-file.branch intopartner-filedid not previously exist; it was created as a copy offile.merge fromfilewas integrated frompartner-file, acceptingmerge.merge intofilewas integrated intopartner-file, acceptingmerge.moved fromfilewas integrated frompartner-file, acceptingtheirsand deleting the original.moved intofilewas integrated intopartner-file, acceptingtheirsand creatingpartner-fileif it did not previously exist.copy fromfilewas integrated frompartner-file, acceptingtheirs.copy intofilewas integrated intopartner-file, acceptingtheirs.ignoredfilewas integrated frompartner-file, acceptingyours.ignored byfilewas integrated intopartner-file, acceptingyours.delete fromfilewas integrated frompartner-file, andpartner-filehad been previously deleted.delete intofilewas integrated intopartner-file, andfilehad been previously deleted.edit fromfilewas integrated frompartner-file, andfilewas 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 intofilewas integrated intopartner-file, andpartner-filewas reopened foreditbefore submission.add fromfilewas integrated from a deletedpartner-file, andpartner-filewas reopened foradd(that is, someone restored a deleted file by syncing back to a pre-deleted revision and adding the file).add intofilewas integrated into previously nonexistentpartner-file, andpartner-filewas reopened foraddbefore 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
|
|
See the “Global Options” section. |
Usage Notes
|
Can File Arguments Use Revision Specifier? |
Can File Arguments Use Revision Range? |
Minimal Access Level Required |
|---|---|---|
|
No |
No |
|