p4 integrate

Synopsis

Open files for branching or merging.

Syntax


p4 [g-opts] integrate [optionsfromFile[revRangetoFile
p4 [g-opts] integrate [options] -b branch [-r] [toFile[RevRange]...]
p4 [g-opts] integrate [options] -b branch -s fromFile [revRange] [toFile...]
p4 [g-opts] integrate [options] -S stream [-r] [-P parentfromFile [revRange]

options: -c changelist -Di -f -h -Oflags -n -m max -Rflags -q -v

Description

When you've made changes to a file that need to be propagated to another file, start the process with p4 integrate. The simplest form of this command is p4 integrate fromFile toFile; this lets the versioning service know that changes in fromFile need to be propagated to toFile, and has the following effects:

  • If toFile doesn't yet exist, fromFile is copied to toFile, then toFile is opened for branch in the client workspace.

  • If toFile exists, and shares a common ancestor with fromfile as above, then toFile is opened for integrate. You can then use p4 resolve to propagate all of, portions of, or none of the changes in fromFile to toFile.

    The p4 resolve command uses fromFile as theirs, toFile as yours, and (if the resolve was scheduled with p4 integrate, the closest common ancestor of fromFile as base, or (if the resolve was scheduled with p4 merge) the file with the most edits in common.

  • If both toFile and fromFile exist, but toFile shares no common ancestor with fromFile, the integration is rejected.

  • If fromFile was deleted at its last revision (and all previous changes have already been integrated between fromFile and toFile), toFile is opened for delete in the client workspace.

  • Whether you move files using p4 move, or whether you use native OS commands to rename files within your workspace (using p4 reconcile or p4 status to update your changelist to reflect the moves you made), p4 integrate automatically detects these actions, adjusts the source-to-target mappings appropriately, and schedules a filename resolve for each remapped file pair.

(Some of the available flags modify this behavior. See the Options section for details.)

The process is complete when you p4 submit toFile to the depot.

To specify multiple files, use wildcards in fromFile and toFile. Any wildcards used in fromFile must match identical wildcards in toFile. Perforce compares the fromFile pattern to the toFile pattern, creates a list of fromFile/toFile pairs, and performs an integration on each pair.

The syntax p4 integratefromFiles toFiles requires you to specify the mapping between fromFiles and toFiles each time changes need to be propagated from fromFiles to toFiles. Alternatively, use p4 branch to store the mappings between fromFiles and toFiles in a branch view, and then use p4 integrate -b branchview whenever you need to propagate changes between fromFiles and toFiles.

In most cases, you can use the p4 merge and p4 copy commands to propagate changes between streams (or branches). When p4 integrate schedules files for resolve, it selects the closest common ancestor as the base, and p4 merge selects (as the base) the revision with the most edits in common with the source and target.

Options

Because some of the integration flags add complexity to the integration process, we've divided the options into Basic Integration Flags and Advanced Integration Flags

Basic Integration Flags

-b branchname [toFiles...]

Integrate the files using the sourceFile/targetFile mappings included in the branch view of branchname. If the toFiles argument is included, include only those target files in the branch view that match the pattern specified by toFiles.

If a revision range is supplied with toFiles, the range refers to source revisions, not target revisions.

-n

Display the integrations this command would perform without actually performing them.

-v

Open files for branching without copying toFiles into the client workspace.

Without this flag, p4 integrate copies newly-branched toFiles into the client workspace from fromFiles. When the -v (virtual) flag is used, With this flag, you can save time by not copying toFiles to the client workspace. Instead, you can fetch them with p4 sync when you need them.

-c changelist

Open the toFiles for branch, integrate, or delete in the specified pending changelist.

If this option is not provided, the files are opened in the default changelist.

-q

Quiet mode; suppresses normal output messages about the list of files being integrated, copied, or merged. Messages regarding errors or exceptional conditions are displayed.

g-opts

See the Global Options section.

Advanced Integration Flags

-b branchname -s fromFile[RevRange] [ToFiles...]

In its simplest form, p4 integrate -b branchname -s fromFile allows you to integrate files using the source/target mappings included in the branch view of branchname, but include only those source files that match the patterns specified by fromFile.

In its more complicated form, when both fromFile and toFile are specified, integration is performed bidirectionally: first, integration is performed from fromFile to toFile; then integration is performed from toFile to fromFile.

This variation of p4 integrate was written to provide some needed functionality to graphical Perforce applications; it is unlikely that you'll need to use this more complex form.

-b branchname -r [toFiles...]

Reverse the mappings in the branch view, integrating from the target files to the source files.

-Di

The -Di flag modifies the way deleted revisions are treated. If the source file has been deleted and re-added, revisions that precede the deletion will be considered to be part of the same source file. By default, re-added files are considered to be unrelated to the files of the same name that preceded them.

-f

Force the integration on all revisions of fromFile and toFile, even if some revisions have been integrated in the past. Best used with a revision range.

-h

Don't automatically sync target files to the head revision before integrating. Use the have revision instead.

-m max

Limit the command to integrating only the first max files.

-Ob

The -Ob flag outputs the base revision for the merge (if any).

-Or

The -Or flag outputs the resolves that are being scheduled.

-Rb

The -Rb flag schedules a branch resolve instead of branching the target files automatically.

-Rd

The -Rd flag schedules a delete resolve instead of branching the target files automatically.

-Rs

The -Rs flag skips cherry-picked revisions that have already been integrated. Using this flag can improve merge results, but can also cause multiple resolves per file to be scheduled.

-S stream [-P parent]

Integrates a stream to its parent. To override the configured parent and integrate to a different target stream, specify-P.

Usage Notes

Can File Arguments Use Revision Specifier?

Can File Arguments Use Revision Range?

Minimal Access Level Required

Yes

Yes

open

  • p4 integrate can be abbreviated as p4 integ.

  • FromFiles are often called source files, and toFiles are often called target files.

  • Any toFiles that p4 integrate needs to operate on must be included in the p4 client view.

  • By default, files that have been opened for branch or integrate with p4 integrate are read-only in the client workspace. You can edit these files before submitting them using p4 edit to reopen the file for edit.

  • Whenever a toFile is integrated from a fromFile, Perforce creates an integration record in its database that describes the effect of the integration. The integration record includes the names of the fromFile, and toFile, the revisions of fromFile that were integrated into toFile, the new revision number for toFile, and the action that was taken at the time of the integration. See p4 integrated for a full description of integration actions.

  • In most cases, p4 integrate performs a lazy copy; the contents of the file are not duplicated on the server, because the integration record contains sufficient information to reproduce the file. Integrations performed on temporary object files (+S and +Sn) do not produce a lazy copy; the integrated tempobj file consumes additional diskspace on the server.

  • Two integration engines are supported in the 2013.2 release.

    The current integration engine (v3) provides improved base selection semantics and expanded resolve capability, and has been improved since its introduction in 2011. As of release 2013.2, the v3 engine is the default integration for Perforce.

    The old integration engine (v2) was introduced in 2006.1 and is still supported for backwards compatibility.

    New installations of Perforce do not need to make any changes in order to take advantage of the new integration engine. Sites that wish to continue using the old (2006.1) integration logic must, as of release 2013.2, manually set the dm.integ.engine configurable to 2, instead of its default value of 3:

    p4 configure set dm.integ.engine=2

    For further information, see the Perforce Knowledge Base:

    http://answers.perforce.com/articles/KB_Article/Generation-3-Integration-Engine

Examples

p4 integ //depot/dev/... //depot/rel2/...

Branch or merge all files in //depot/dev/... to the corresponding files in //depot/rel2/...

If there is no corresponding file in //depot/rel2/..., this creates it.

p4 integ -b rel2br

Branch or merge all fromFiles contained in the branch view rel2br into the corresponding toFiles as mapped through the branch view.

p4 integ -b rel2br //depot/rel2/headers/...

Branch or merge those fromFiles contained in the branch view rel2br that map to the toFiles //depot/rel2/headers/...

p4 integ -b rel2br -r //depot/rel2/README

Branch or merge fromFile //depot/rel2/README from its toFile as mapped through the branch view rel2br.

Related Commands

To create or edit a branch mapping

p4 branch

To view a list of existing branch mappings

p4 branches

To view a list of integrations that have already been performed and submitted

p4 integrated

To propagate changes from one file to another after opening files with p4 integrate

p4 resolve

To view a history of all integrations performed on a particular file

p4 filelog

Hide partial matches
Highlight matches
0 matching pages