c# - 使用 TeamFoundationClient TFS2008 和 VS2010 以编程方式合并

Question

我有适用于 VS 2010 的 Addin VS(可能在未来的 VSIX 中)。 我想对任何单个文件(sql 文件)进行分支，然后以编程方式进行合并。

我看到了几个选项:

GetStatus status = workspace.Merge

How to merge TFS change sets programmatically?

http://blogs.microsoft.co.il/shair/2009/04/20/tfs-api-part-19-merge/

MergeContent(Conflict, true);

workspace.Merge 可以显示合并的对话框模式(我认为是 diffmerge.exe)并显示结果(解决冲突)？注意:就我而言，现在，我想要显示合并工具。

TFS API MergeContent returns false without showing merge tool

有tf命令(命令行，不是C##

tf diff[erence] itemspec [/version:versionspec]

tf merge [/recursive] [/force] [/candidate] [/discard] [/version:versionspec] [/lock:none|checkin|checkout] [/preview] [/baseless] [/nosummary] [/noimplicitbaseless] [/conservative] [/format:(brief|detailed)] [/noprompt] [/login:username,[password]] source destination

tf resolve [itemspec]

[/auto:(AutoMerge|TakeTheirs|KeepYours|

OverwriteLocal|DeleteConflict

|KeepYoursRenameTheirs)]

[/preview] [(/overridetype:overridetype | /converttotype:converttype] [/recursive]

[/newname:path] [/noprompt]

[/login:username, [password]]

关于合并文件的任何建议，以及必须的选项:

1) 显示合并对话框 (diffmerge)

2) 自动，不显示用于合并(diffmerge 或其他？)和解决冲突的对话框。

Answer 1

从 visual studio 安装目录 C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE 中的 App Exe 文件中复制 vsDiffMerge.exe

var mergetool = new ThirdPartyToolDefinition(".*",ToolOperations.Merge,"vsDiffMerge.exe","","/m %1 %2 %3 %4");
var toolcol= ThirdPartyToolDefinitionCollection.Instance.FindTool(".*",ToolOperations.Merge);
if (toolcol == null)
   {
   ThirdPartyToolDefinitionCollection.Instance.AddTool(mergetool);
   ThirdPartyToolDefinitionCollection.Instance.PersistAllToRegistry();
   }

var controlsAssembly = Assembly.GetAssembly(typeof(ControlAddItemsExclude));
var vcResolveCoinflictsDialogType = controlsAssembly.GetType("Microsoft.TeamFoundation.VersionControl.Controls.DialogResolveConflicts");
var ci = vcResolveCoinflictsDialogType.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, new[] { typeof(Workspace), typeof(string[]), typeof(bool) }, null);
var resolveCoinflictsDialog = (Form)ci.Invoke(new object[] { workspace, null, true });
resolveCoinflictsDialog.ShowDialog(parent);

ThirdPartyToolDefinitionCollection.Instance.Remove(mergetool);
ThirdPartyToolDefinitionCollection.Instance.PersistAllToRegistry();