Perforce, How to integrate a change to another branch?

匿名 (未验证) 提交于 2019-12-03 02:48:02

问题:

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?

回答1:

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.



标签
易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!