Perforce 2005.1 Command Reference
<< Previous Chapter
p4 info
Table of Contents
Index
Perforce on the Web
Next Chapter >>
p4 integrated

p4 integrate

Synopsis

Open files for branching or merging.

Syntax

p4 [g-opts] integrate [options] fromFile[revRange] toFile
p4 [g-opts] integrate [options] -b branch [toFile[fromRevRange]...]
p4 [g-opts] integrate [options] -b branch -s fromFile[revRange] [toFile...]

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 Perforce server know that changes in fromFile need to be propagated to toFile, and has the following effects:

(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 integrate fromFiles 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.

Options

Because some of the more recent 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.

-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, Perforce won't copy 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.

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 P4Win, the Perforce Windows Client; 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.

-d

The -d flag enables integrations around deleted revisions.

If the target file has been deleted and the source file changed, using -d re-branches the source file on top of the target file.

If the source file has been deleted and the target file has changed, using -d deletes the target file.

If you do not use the -d flag, outstanding edits may not be mixed with a deleted file.

-Dt
-Ds
-Di

The -Dt flag allows integration around a deleted target file; the source file is branched onto the deleted target.

The -Ds flag allows integration around a deleted source file; if the source file has been deleted, any modified target file is also deleted.

The -Di flag ignores the fact that a source file was deleted and re-added when searching for an integration base.

-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.

-i

Perform the integration even if toFile and fromFile share no common ancestor, using the first revision as the base.

-I

Equivalent to -i, the -I flag exists for compatibility purposes.

-o

The -o flag outputs the base file name and revision to be used in subsequent resolves, if a resolve is needed.

-t

Propagate the source file's filetype to the target file.

(Newly-branched files always use the source file's filetype, but without -t, the target file retains its previous filetype.)

Usage Notes

Can File Arguments Use
Revision Specifier?

Can File Arguments Use
Revision Range?

Minimal Access Level Required

Yes

Yes

open

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 specification

p4 branch

To view a list of existing branch specifications

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


Perforce 2005.1 Command Reference
<< Previous Chapter
p4 info
Table of Contents
Index
Perforce on the Web
Next Chapter >>
p4 integrated
Please send comments and questions about this manual to manual@perforce.com.
Copyright 1999-2005 Perforce Software. All rights reserved.
Last updated: 05/12/05