将分支策略从ClearCase迁移到TFS 2010 [英] Migrating a branching strategy from ClearCase to TFS 2010

问题描述

我在一家内部 IT商店中，我们目前使用ClearCase进行版本管理。为此，我们的分支策略很常见，主要分支保留用于实时代码，而主要分支则保留给项目和修补程序类型的活动。每个项目（它们经常重叠）在主项目上都有一个分支，我们没有多层分支。

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.

我们遇到的情况是我们必须在集成分支之间进行合并这样，版本4分支就可以在版本3上线之前获得所有版本3的更改（例如），并以此为基准。以及当项目很高且必须得到支持时，修复程序发生的次数。

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.

但是，在TFS领域中这实际上是不可能的因为我们不想在命令行中进行无基础的合并，但是我们需要具有高度灵活的分支功能-我们在ClearCase中已经真正习惯了这种功能。

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.

因此，理想情况下，我们希望TFS分支机构能够拥有生产基准，能够进行短期修补程序的分支，能够进行项目的分支-而不实际知道哪个分支机构会首先上线（并以此为基准）。处理完所有MS文档后，它们似乎都集中在产品类型环境上-但是我们主要是支持和增强商店。

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.

我正在寻找建议/ pointers-我曾经是ClearCase管理员，可以很高兴地在脑子上玩弄分支-但是我提出的所有内容看起来都不适合TFS-但这很可能是因为我的思维过程类似于ClearCase并且与TFS不一致（尚未！）

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!)

推荐答案

我对TFS2010经验不足，但考虑分支机构现在是TFS2010的一等公民，实际的解决方案是将您的增强功能视为产品，并相应地创建一个补丁分支。

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.

我想您已经阅读了 T FS2010分支指南。

它确实包含用于解决热修复问题的分支方案。

It does include a branching scenario for addressing hot-fixes issues.

（来自 TFS分支指南-场景2010_20100330.pdf文档）

(from the "TFS Branching Guide - Scenarios 2010_20100330.pdf" document)

这篇关于将分支策略从ClearCase迁移到TFS 2010的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！