Click or drag to resize

IntegrateFilesCmdFlags Enumeration

Flags for the integrate command.

Namespace:  Perforce.P4
Assembly:  p4api.net (in p4api.net.dll) Version: 2023.2.255.3501
Syntax
[FlagsAttribute]
public enum IntegrateFilesCmdFlags
Members
  Member nameValueDescription
None0 No flags.
Force1
BranchIfTargetDeleted2 -Dt If the target file has been deleted and the source file has changed, re-branch the source file on top of the target file.
DeleteIfSourceDeleted4 -Ds If the source file has been deleted and the target file has changed, delete the target file.
IntegrateAllIfSourceDeleted8 -Di If the source file has been deleted and re-added, attempt to integrate all outstanding revisions of the file, including revisions prior to the delete. By default, 'p4 integrate' only considers revisions since the last add.
LeaveHaveVersion16 The -h flag leaves the target files at the revision currently synced to the client (the '#have' revision). By default, target files are automatically synced to the head revision by 'p4 integrate'.
IntegrateUnrelated32
DisplayBaseFile64 The -o flag displays the base file name and revision that will be used in subsequent resolves if a resolve is needed.
PreviewIntegrationsOnly128 The -n flag displays a preview of required integrations.
SwapSourceAndTarget256 The -r flag reverses the mappings in the branch view, with the target files and source files exchanging place. The -b branch flag is required.
BidirectionalView512
PropogateType1024
DontCopyNewBranchFiles2048 The -v flag speeds integration by not syncing newly-branched files to the client. The files can be synced after they are submitted.
BranchResolves4096 -Rb Schedules 'branch resolves' instead of branching new target files automatically.
DeleteResolves8192 -Rd Schedules 'delete resolves' instead of deleting target files automatically.
SkipRevisions16384 -Rs Skips cherry-picked revisions already integrated. This can improve merge results, but can also cause multiple resolves per file to be scheduled.
See Also