The p4 integrated command shows the integration history of the selected files, in the format:
|
|
|
|
|
file did not previously exist; it was created as a copy of partner-file.
|
|
|
partner-file did not previously exist; it was created as a copy of file.
|
|
|
file was integrated from partner-file, accepting merge.
|
|
|
file was integrated into partner-file, accepting merge.
|
|
|
file was integrated from partner-file, accepting theirs.
|
|
|
file was integrated into partner-file, accepting theirs.
|
|
|
file was integrated from partner-file, accepting yours.
|
|
|
file was integrated into partner-file, accepting yours.
|
|
|
file was integrated from partner-file, and partner-file had been previously deleted.
|
|
|
file was integrated into partner-file, and file had been previously deleted.
|
|
|
file was integrated from partner-file, and file 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 (Perforce 2001.1 and later).
|
|
|
file was integrated into partner-file, and partner-file was reopened for edit before submission (Perforce 99.2 and later).
|
|
|
file was integrated into previously nonexistent partner-file, and partner-file was reopened for add before submission (Perforce 99.2 and later).
|
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 branch flag is used, only files integrated from the source to target files in the branch view are shown.
If the optional -r flag is provided, the mappings in the branch view are reversed. This flag requires the use of the -b
branch flag.
