将分支策略从 ClearCase 迁移到 TFS 2010
我在“内部”IT 商店，我们目前使用 ClearCase 进行版本管理。我们的分支策略对此很常见，主分支保留用于实时代码，并为项目和修补程序类型活动分支主分支。每个项目（它们经常重叠）都有一个主分支，我们没有多层分支。
我们遇到的情况是，我们必须在集成分支之间进行合并，以便版本 4 分支在版本 3 上线之前获取所有版本 3 更改（例如），从而建立基线。当项目规模很大且必须得到支持时，修补程序发生的次数。
然而，这在 TFS 世界中实际上是不可能的，因为我们不想必须到命令行来进行毫无根据的合并，但是我们需要具有高度灵活的分支功能 - 我们确实拥有的东西习惯与 ClearCase 一起使用。
因此，理想情况下，我们希望 TFS 分支允许我们拥有生产基线，能够分支进行短期修补程序，能够分支执行项目 - 而无需实际知道哪个分支将上线（因此基线）首先。浏览完所有 MS 文档后，它们似乎都专注于产品类型环境 - 但我们主要是一个支持和增强商店。
我正在寻找建议/指针 - 我一直是 ClearCase 管理员，并且可以很高兴地处理心理分支 - 但我想出的所有内容看起来都不适合 TFS - 但这很可能是因为我的心理过程类似于 ClearCase，并且与 TFS 不协调（还！）
I am in an "internal" IT shop and we currently use ClearCase for version management. Our branching strategy is common for this with the main branch being reserved for live code and branching off main for project and hotfix type activities. Each project (and they overlap often) has a branch off main, we don't have multitiered branching.
We get the situation were we have to do merging between integration branches so that the release 4 branch picks up all of the release 3 changes (for example) before release 3 goes live and thus is baselined. And the number of times that a hotfix happens when a project is high and has to be supported.
However, this isn't really going to be possible within the TFS world as we don't want to have to drop to the command line to do baseless merging, however we need to have a highly flexible branching capability - something we have got really used to with ClearCase.
So ideally we want TFS branches to allow us to have a production baseline, to be able to branch off to do short term hotfixes, to be able to branch off to do projects - without actually knowing which of the branches will go live (and thus baselined) first. Having worked through all of the MS documents they all appear to be focused on product type environments - but we are mostly a support and enhancement shop.
I'm looking for recommendations/pointers - I've been a ClearCase admin and can quite happily juggle with branching mentally - but everything I come up with just doesn't look like it will fit with TFS - but this is most probably because my mental process is ClearCase-like and isn't in tune with TFS (yet!)
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我对 TFS2010 没有太多经验，但考虑 分支现在是 TFS2010 的一等公民，一个实用的解决方案是将您的增强视为“产品”并相应地创建补丁分支。
我想您已经阅读了 TFS2010 分支指南。
它确实包括用于解决热修复问题的分支场景。
（来自“TFS 分支指南 - 场景 2010_20100330.pdf”文档）
I haven't much experienced with TFS2010, but considering branches are now first class citizen with TFS2010, one practical solution would be to consider your enhancement as a "product" and create a patch branch accordingly.
I suppose you have read the TFS2010 Branching Guide.
It does include a branching scenario for addressing hot-fixes issues.
(from the "TFS Branching Guide - Scenarios 2010_20100330.pdf" document)