Flags for the integrate command.
Namespace: Perforce.P4Assembly: p4api.net (in p4api.net.dll) Version: 2017.3.160.836 (2017.3.160.0836)
Syntax
| C# |
|---|
[FlagsAttribute] public enum IntegrateFilesCmdFlags |
| Visual Basic |
|---|
<FlagsAttribute> _ Public Enumeration IntegrateFilesCmdFlags |
| Visual C++ |
|---|
[FlagsAttribute] public enum class IntegrateFilesCmdFlags |
Members
| Member name | Value | Description | |
|---|---|---|---|
| None | 0 | No flags. | |
| Force | 1 | ||
| BranchIfTargetDeleted | 2 | -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. | |
| DeleteIfSourceDeleted | 4 | -Ds If the source file has been deleted and the target file has changed, delete the target file. | |
| IntegrateAllIfSourceDeleted | 8 | -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. | |
| LeaveHaveVersion | 16 | 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'. | |
| IntegrateUnrelated | 32 | ||
| DisplayBaseFile | 64 | The -o flag displays the base file name and revision that will be used in subsequent resolves if a resolve is needed. | |
| PreviewIntegrationsOnly | 128 | The -n flag displays a preview of required integrations. | |
| SwapSourceAndTarget | 256 | 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. | |
| BidirectionalView | 512 | ||
| PropogateType | 1024 | ||
| DontCopyNewBranchFiles | 2048 | The -v flag speeds integration by not syncing newly-branched files to the client. The files can be synced after they are submitted. | |
| BranchResolves | 4096 | -Rb Schedules 'branch resolves' instead of branching new target files automatically. | |
| DeleteResolves | 8192 | -Rd Schedules 'delete resolves' instead of deleting target files automatically. | |
| SkipRevisions | 16384 | -Rs Skips cherry-picked revisions already integrated. This can improve merge results, but can also cause multiple resolves per file to be scheduled. |
