Perforce 合并更改列表 [英] Perforce merge changelist
问题描述
由于遵循了不良的 scm 实践，我面临合并问题.当最新的变更列表 # 是 1000 时，我给出了一个 perforce 分支的构建.现在在开发团队提交了更多变更列表之后，最新的变更列表 # 是 1050.问题是构建的冒烟测试失败了，现在我修复了它并提交了一个更改列表 #1051.
I am facing an issue of merging due to bad scm practices followed. I gave a build off of a perforce branch when the latest changelist # was, lets say, 1000. Now after the dev team has submitted many more changelists the latest changelist # is 1050. Issue is that smoke test on the build failed and now I fixed it and submitted a changelist # 1051.
我的问题是有没有办法以某种方式将 1051 中所做的更改合并到 1000 中.或者换句话说，创建一个包含更改列表 # 1000 之前的所有更改并且仅包括更改列表 # 1051 的构建.
My question is there a way to somehow merge the change made in 1051 into 1000. Or in other words create a build with all the changes upto changelist # 1000 and including only changelist # 1051 as well.
我希望我能够以合理的方式解释这个问题.
I hope I was able to explain the issue in a way that makes sense.
P.S:我知道 Main、Release 和 Dev 分支的概念.不知何故，我现在陷入了构建 dev 分支并寻找解决方案的混乱局面.
P.S: I know the concept of Main, Release, and Dev branches. Somehow now I am in this mess of giving a build off of the dev branch and looking for a solution.
推荐答案
一种方法是创建另一个分支，如:
One way is to create another branch, as in:
- p4 integ//depot/build/branch/...@1000//depot/bugfix/branch/...
- p4 提交
- p4 integ//depot/build/branch/...@=1051//depot/bugfix/branch/...
- p4 解析
- p4 提交
现在构建//depot/bugfix/branch 并将其提供给您的测试团队.
Now build //depot/bugfix/branch and give that to your test team.
这篇关于Perforce 合并更改列表的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
