创建与第二个分支具有相同初始代码库的 TFS 分支
这是我当前的设置。 (TFS2008)
我有一个最新的主干。 我在 TRUNK 上有一个 BRANCH-A,只合并了生产就绪的代码。 我想在 TRUNK 之外创建一个新的 BRANCH-B,但我不需要所有最新代码,我只想要 BRANCH-A 中当前的代码。
完成此操作后,我将从 TRUNK 合并到 BRANCH-A 和 BRANCH-B(因此我不想将 BRANCH-B 从 BRANCH-A 中分支出来。)
谢谢。
Here is my current setup. (TFS2008)
I have a TRUNK with latest.
I have BRANCH-A off of TRUNK with only the production ready code merged in.
I would like to create a new BRANCH-B off of TRUNK but I don't want all the latest code, I only want what is currently in BRANCH-A.
After this is done I will be merging into both BRANCH-A and BRANCH-B from the TRUNK (so I don't want to branch BRANCH-B off of BRANCH-A.)
Thanks.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
您需要执行无基础合并。您想要实现的这种同级情况正是如何:执行Visual Studio Team Foundation Server 中的无基础合并:
You need to perform a baseless merge. This sibling situation that you want to achieve is exactly what is described in How To: Perform a Baseless Merge in Visual Studio Team Foundation Server:
创建 BRANCH-B 时,您可以选择最新或特定日期/变更集/标签。看一下您何时创建 BRANCH-A 并从相同的日期/变更集/标签创建 BRANCH-B。只要您没有对 BRANCH-A 进行任何更改,您就可以创建 B 来匹配。
另外,如果您还没有看过 TFS 2008 分支指南,请查看一下。有一些很棒的信息,并且采用了务实的方法。
When you create BRANCH-B, you can either choose latest or a specific date/changeset/label. Take a look when you created BRANCH-A and create the BRANCH-B from the same date/changeset/label. As long as you haven't made any changes to BRANCH-A, you can create B to match.
Also, if you haven't already, take a look at the TFS 2008 Branching guidance. There is some great information and uses a pragmatic approach.
对于后备箱
在创建分支时,您可以选择“从版本分支” - 默认情况下选择“按最新版本”。
选择按变更集或按日期
For TRUNK
On Create Branch you have option as a "Branch from Version" - by default By Latest Version is selected.
Select By changeSet or By Date