如何阻止变更集合并到TFS中? [英] How to block a changeset from merging in TFS?

问题描述

在TFS 2010中，如何标记一个变更集，使其不能从一个分支合并到另一个分支?例如，使用选定的变更集"选项时，它不会显示在Visual Studio的合并向导"中.基本上，我希望它看起来像所涉及的变更集已合并到另一个分支中.

In TFS 2010, how can one mark a changeset so that it cannot be merged from one branch to another? For example, so it doesn't show in the "merge wizard" in Visual Studio when using the "Selected changesets" option. Basically, I want it to look like the changeset in question has already been merged into another branch.

我们的构建过程会自动增加所有AssemblyInfo.cs文件中的版本号.在仅包含版本增量的发行分支中的变更集不应合并到主干(或其他发行分支)中.

Our build process auto-increments the version numbers in all our AssemblyInfo.cs files. A changeset in a release branch that contains only version increments should not be merged into trunk (or another release branch, of course).

我相信这类似于TortoiseSVN中的仅记录合并(阻止合并的修订版本)"复选框.

I believe this is analogous to the "Only record the merge (block revisions from getting merged)" checkbox in TortoiseSVN.

推荐答案

我认为我找到了问题的答案. tf.exe命令具有一个开关"/discard"，该开关记录为不执行合并操作，但是更新合并历史记录以跟踪合并的发生."这正是我想要的.如果这不是我期望的，我会尝试并发布更新.

I think I found the answer to my question. The tf.exe command has a switch "/discard" which is documented as "Does not perform the merge operation, but updates the merge history to track that the merge occurred." This is exactly what I was looking for. I'll try it and post an update if this not what I'm expecting.

http://msdn.microsoft.com/en-us/library/bd6dxhfy(v = vs.80).aspx

这篇关于如何阻止变更集合并到TFS中?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！