Perforce, How to integrate a change to another branch?

branch perforce branching-and-merging
fifth picture fifth · Aug 24, 2012 · Viewed 28.1k times · Source

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?

Answer

user1054341 picture user1054341 · Aug 27, 2012

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.

Related questions

Perforce — move a shelved Changelist from main to branch?

I wonder if there is any way to move a Changelist which was created editing on /main/ to a branch /dev/branch? I have six such Changelists with a lot of files in them. I shelved all files and would …

Read More
Git fetch remote branch

My colleague and I are working on the same repository. We've branched it into two branches, each technically for different projects, but they have similarities, so we'll sometimes want to commit back to the *master from the branch. However, I …

Read More
How to remove local (untracked) files from the current Git working tree

How do you delete untracked local files from your current working tree?

Read More