Perforce,如何将更改集成到另一个分支? [英] Perforce, How to integrate a change to another branch?
本文介绍了Perforce,如何将更改集成到另一个分支?的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!
问题描述
我有主干和发布分支。如果我修复了发布分支中的错误,则绝对应该将其集成回主干。但是,我没有找到专门用于集成这样一个变更列表的命令;我错过了什么吗?
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?
推荐答案
例如,要集成变更列表100,您可以使用:
To integrate changelist 100, for example, you'd use:
p4 merge //releasebranch/...@=100 //trunk/...
p4 resolve
p4 submit
(如果您使用的是旧版Perforce服务器,则必须使用 integ而不是 merge。 )
(If you have an older Perforce server you'll have to use 'integ' instead of 'merge'.)
请注意,在这种情况下,'@ = 100'与'@ 100,100'的含义相同。
Note that '@=100' means the same thing as '@100,100' in this context.
这篇关于Perforce,如何将更改集成到另一个分支?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!
查看全文