Perforce 2002.2 Command Reference | ||
<< Previous Chapter p4 info |
Table of Contents Index Perforce on the Web |
Next Chapter >> p4 integrated |
The process is complete when you p4 submit toFile to the depot.
Multiple files can be specified by using wildcards in fromFile and toFile. If so, 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.
-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. |
See the Global Options section. |
-b branchname -s |
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 |
Reverse the mappings in the branch view, integrating from the target files to the source files. |
-d |
Allow non-conforming adds and deletes. By default, a non-existent toFile is only opened for branch or add if fromFile conforms to the condition that its revRange starts with a branch or add. (When revRange is not given, this condition is always met, because the implied revRange is #1 to #head.) The -d flag allows a non-existent toFile to be opened for branch or add even if the first revision of fromFile in revRange is an edit or an integrate. An existing toFile is only opened for delete if it conforms to the condition that all of its revisions are already accounted for in previous integrations to or from fromFile. In other words, toFile is only opened for delete if all of its changes either came from fromFile or have been merged into fromFile. The -d flag allows an existing toFile to be opened for delete even if it doesn't conform to these conditions. |
-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 was not originally branched from fromFile. In this case, the last revision of fromFile that was opened for add is used as base (this is almost always the first revision of fromFile). |
-I |
Perform the integration even if toFile was not originally branched from fromFile, or was indirectly branched from fromFile. In this case, the last revision of fromFile that was opened for add is used as base (this is almost always the first revision of fromFile). Where there is significant integration history, the -I flag can cause performance issues. If integrating with a branch specification with the indirect option set (see p4 branch), this flag is implicit. |
-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.) |
Perforce 2002.2 Command Reference | ||
<< Previous Chapter p4 info |
Table of Contents Index Perforce on the Web |
Next Chapter >> p4 integrated |