任何提供冲突报告（指标）的差异/合并工具？
上下文：我正在准备使用 Visual Studio 2008 和 TFS 进行大型 C# 合并。我需要创建一个报告，其中包含每个文件的文件和冲突数量（总更改和冲突）（当然还有总数）
问题：我无法这样做，原因有两个（第一个是已解决）：
1- 使用 TFS 合并我可以访问文件比较，但无法导出冲突文件列表...我只能尝试解决冲突。 （我已经使用 Beyond Compare 解决了问题 1。它允许我导出文件列表）
2- 使用 TFS 合并我只能手动访问每个文件都可以获取冲突数量...但我有超过 800 个文件（并且可能必须在不久的将来重复它，所以不是手动执行此操作的选项）
有几十个文件比较工具（http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools），但是我不确定哪一个可以（如果有的话）给我这些指标。我还在这里阅读了几个论坛和问题，但都是更一般的问题（哪个比较工具更好），我正在寻找一份非常具体的报告。
所以我的问题是：
- Visual Studio 2010（使用 仍然是TFS2008）能够做到这一点 报告/导出？
- 有没有 提供这种类型的工具 指标（现在我正在尝试超越比较）
CONTEXT: I am preparing a big C# merge using visual studio 2008 and TFS. I need to create a report with the files and the number of collisions (total changes and conflicts) for each file (and in total of course)
PROBLEM: I cannot do it for two reasons (first one is solved):
1- Using TFS merge I can have access to the file comparison but I cannot export the list of conflicting files... I can only try to resolve the conflicts.
(I have solved problem 1 using beyond compare. It allows me to export the file list)
2- Using TFS merge I can only access manually for each file to get the number of conflicts... but I have more than 800 files (and probably will have to repeat it in the close future so is not an option doing it manually)
There are dozens of file comparison tools (http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools ) but I am not sure which one could (if any) give me these metrics. I have also read several forums and questions here but are more general questions (which diff tool is better) and I am looking for a very specific report.
So my questions are:
- Is Visual Studio 2010 (using
still TFS2008) capable of doing such
reports/exportation? - Is there any
tool that provide this kind of
metrics (Now I am trying Beyond Compare)
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
如果您要合并大量文件，您希望将报告的差异降至最低限度。如果代码重新格式化，或者行中有任何更改，面向行的差异工具会报告更改。
SD C# Smart Differencer 报告基于源代码语法的差异，而不是文本的物理布局。它从程序员的角度报告基于语言元素（标识符、表达式、语句、块、方法等）的变化（插入、删除、复制、移动、重命名）。 （重命名检测意味着它将忽略跨块/文件一致更改的名称）。
以这种方式报告往往会产生比面向行的差异小得多的差异，从而减少您的注意力。
If you are going to merge a huge number of files, you want to minimize the differences reported to the barest minimum. Line-oriented diff tools report changes if the code is reformatted, or there's any change in a line.
The SD C# Smart Differencer reports differences based on source code syntax, not the physical layout of the text. It reports changes based on language elements (identifiers, expressions, statements, blocks, methods, ...) in terms of effect (insert, delete, copy, move, rename) from the point of view of the programmer. (The rename detection means it will ignore names changed consistently across a block/file).
Reporting this way tends to produce considerably smaller diffs than line-oriented diffs, thus using less of your attention.
经过几天的调查后回答我的问题：
1- Visual Studio 2008 & TFS 2008 无法导出任何信息。
2- 尝试多种工具后：
BeyondCompare 3 允许从 IU 获取指标并轻松导出它们。 （使用文件比较报告/XML 转储过滤文件，而不是使用文件夹比较报告。）
KDiff3 允许使用 IU 获取一些指标，但无法导出它们。
没有尝试过命令行方法
注意：请注意，不同的工具有不同的冲突解决方案，因此指标不会是 100 ％ 准确的。例如，TFS 中包含 20 个更改和 3 个冲突的文件使用 Beyond Compare 报告为 20 个更改和 8 个冲突。
Answer to my question after several days investigating:
1- Visual Studio 2008 & TFS 2008 cannot export any information.
2- After trying several tools:
BeyondCompare 3 allows getting metrics from IU and easily export them. (Used File Compare Report/XML Dump filtering files instead of using Folder Compare Report.)
KDiff3 allow getting some metrics using IU, but is not possible to export them.
Did not tried command line approach
NOTE: be aware that different tools have different conflict resolutions so metrics will be not 100% accurate. For example a file with 20 changes and 3 conflicts in TFS was reported as 20 changes 8 conflicts using beyond compare.