Menu
I have trunk and a release branch. If I fixed a bug in release branch, I definitely should integrate the fix back to trunk. However, I didn't find a command dedicated to integrate such a single change list; did I miss something?
740
To integrate files, you open them for integration, specifying source and target, then submit the changelist containing the open files. P4V performs three types of integration: Branching, which creates a new codeline or branch. For more information, see Creating Branches.
In Perforce, we say we integrate changes from one branch into another. This is not a capricious choice of words. It's based on the notion that, even when two branches are closely related, not all changes in one branch can be merged into the other.
The branch mapping is used by the integration process to create and update branches., which specifies the relationship between two codelines. When you branch, you can use the branch mapping instead of a file mapping. Branch mappings are displayed in the right pane on the Branch Mapping tab.
To integrate changelist 100, for example, you'd use:
p4 merge //releasebranch/...@=100 //trunk/...
p4 resolve
p4 submit
(If you have an older Perforce server you'll have to use 'integ' instead of 'merge'.)
Note that '@=100' means the same thing as '@100,100' in this context.
71
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
