TFS下的MS Office文件差异

Question

在Team Foundation Server Source Explorer中比较两个版本的MS Word doc/Excel book时,结果是无聊的"Binary filles differ"对话框.

它不一定是这样的.相关的应用程序(Word/Excel)具有出色的内置差异界面.您可以在使用启用版本控制的SharePoint文件库时看到它并与之前的版本进行比较.此外,当你做差异时,TortoiseSVN会提出它.

问题 - 我可以在TFS中启用此功能吗？

Answer 1

您可以为每种文件类型(扩展名)配置比较(差异)和合并工具.这可以通过工具 - >选项 - >源代码管理 - > Visual Studio Team Foundation Server - >配置用户工具"按钮或通过命令行使用tf diff /configure

为了设置比较工具,您将指定扩展名(.*如果您希望它用于未指定的所有文件,请使用),您正在设置的操作(比较或合并),要调用的命令和命令的参数.对于参数,可以使用的变量如下:

%1 = Original file (in diff, the pre-changes file, in merge, the "server" or "theirs" file, the file that is the base file after "their" changes were applied)
%2 = Modified file (in diff, the post-changes file, in merge the "yours" file - the base file with "your" changes applied)
%3 = Base file (in the 3-way merge operation, the file which both "theirs" and "yours" are derived from - the common ancestor.  This doesn't mean it's the version the changes were based from, since this may be a cherry-pick merge)
%4 = Merged file (The output file for the merge operation - the filename that the merge tool should write to)
%5 = Diff options (any additional command-line options you want to pass to your diff tool - this comes into play only when using "tf diff /options" from the command-line)
%6 = Original file label (The label for the %1 file)
%7 = Modified file label (The label for the %2 file)
%8 = Base file label (The label for the %3 file)
%9 = Merged file label (The label for the %4 file)

要使用TortoiseSVN - 它看起来像你想要的那样 - 你可以指定命令作为文件路径 TortoiseMerge.exe

要进行比较,请指定参数: /base:%1 /mine:%2 /basename:%6 /minename:%7

对于合并,请指定参数: /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9

关于各种合并工具(包括其他单词比较工具DiffDoc.exe)的参数的这个和其他信息可以在James Manning的MSDN博客上找到.您还可以在命令行中调用单词比较工具的另一个stackoverflow问题中使用.