| |
|
"Cherry Picking" Integrations
|
SUMMARY:
By default, the p4 integrate command attempts to integrate (merge) all pre...
|
|
Branching Codelines and Merging Changes
|
TASK:
How do I branch a codeline?
How do I merge changes between two codelines?
SOLUTION:
Briefly, you need to use the ...
|
|
Branching Work In Progress
|
PROBLEM:
How do I branch work in progress?
What do you do if you have completed work on opened files in your workspace and then realized that, for one reason or another, you are not allowed to subm...
|
|
Creating Vendor Branches for Third Parties
|
SUMMARY:
This article describes a strategy for setting up a "vendor branch" in your depot where you can submit source code modified by an outside source.
DETAILS:
When the third party delivers cod...
|
|
Determining Revisions to Integrate
|
SUMMARY:
This article describes how Perforce determines which source file revisions need integrating when you run the ...
|
|
Determining Which Files are Reopened for Add/Edit
|
PROBLEM:
How can I identify files that have been opened for integrate and then reopened for edit or add? The p4 opene...
|
|
How To Rollback An Integration
|
TASK:
How do I undo mistakes in integration?
How do I rollback an unintended integrate?
SOLUTION:
When you are undoing a mistaken integration, the first thing to check is whether or not the integ...
|
|
Improvement Of Resolve Algorithms
|
SUMMARY:
Merging algorithms have steadily improved with each subsequent release of the Perforce server. Merges that would not auto-resolve at 2004.2 will do so at 2006.1 and later versions.
DE...
|
|
Indirect Integrations
|
SUMMARY:
This article explains how Perforce handles the integration of indirectly related files.
DETAILS:
Codelines that have been branched from one another using the ...
|
|
Integration/Resolve Records
|
SUMMARY:
Each time an integration is performed, records are stored that guide the Perforce server in performing future integrations and can be examined by users to see what resolve option was used. T...
|
|
Merging Changes Between Unrelated Codelines
|
PROBLEM:
How do I merge changes between codelines that are not branched from each other?
SOLUTION:
Consider the following situation. You have two codeline paths B and C, each of which was original...
|
|
Preventing the Propagation of Deletes
|
SUMMARY:
There are several ways to deal with the problem of maintaining a file in one branch after it is deleted in another branch.
DETAILS:
In branches related by integration, if you delete a fil...
|
|
Sparse Branching
|
SUMMARY:
Branching a subset of project files, rather than branching an entire project tree, is often referred to as "sparse branching". A sparse branch might also be referred to in some contexts...
|
|
The 'Direct' Branchspec Option
|
SUMMARY:
In version 2003.2 there was an option called direct in the the branchspec but it was removed in 2004.2 and subsequent versions. What did this flag do and why is it no longer available?
DET...
|
Home
About Perforce
Contact
Site Map
RSS
Privacy Policy