p4 integrated

Synopsis

Syntax

Description

file#revision-range - integrate-action partner-file#revision-range

• 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 of partner-file.
  branch into	partner-file did not previously exist; it was created as a copy of file.
  merge from	file was integrated from partner-file, accepting merge.
  merge into	file was integrated into partner-file, accepting merge.
  copy from	file was integrated from partner-file, accepting theirs.
  copy into	file was integrated into partner-file, accepting theirs.
  ignored	file was integrated from partner-file, accepting yours.
  ignored by	file was integrated into partner-file, accepting yours.
  delete from	file was integrated from partner-file, and partner-file had been previously deleted.
  delete into	file was integrated into partner-file, and file had been previously deleted.
  edit from	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).
  edit into	file was integrated into partner-file, and partner-file was reopened for edit before submission (Perforce 99.2 and later).
  add into	file was integrated into previously nonexistent partner-file, and partner-file was reopened for add before submission (Perforce 99.2 and later).

Options

g-opts

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	list

Related Commands

To see a list of integrations that have not yet been resolved	p4 resolve -n
To view a list of integrations that have been resolved but not yet submitted	p4 resolved
To perform an integration	p4 integrate
To view the actions taken for all revisions of a particular file (including all the files from which that particular file was integrated)	p4 filelog [-i] file