Perforce, How to integrate a change to another branch?

前端 未结 2 611
鱼传尺愫
鱼传尺愫 2021-02-05 13:28

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 integ

相关标签:
2条回答
  • 2021-02-05 14:06

    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.

    0 讨论(0)
  • 2021-02-05 14:20

    I have used this:

    p4 integrate -c 625466 //SrcPath/...@622912,@622912 //DestPath/...
    

    Where CL 622912 is the one we want to integrate, and CL 625466 is the new CL.

    0 讨论(0)
提交回复
热议问题