Visual Studio 中 TortoiseSVN 的差异/合并工具
我们最近根据本网站的建议从 Visual SourceSafe“升级”到 SVN。我们当前的源代码控制设置是：TortoiseSVN 和 VisualSVN。到目前为止，我们对此非常满意，但我想知道使用与所包含的工具（TortoiseMerge）不同的差异/合并工具是否有任何额外的好处。
TortoiseMerge 看起来相当强大，但也比 VSS 的“查看历史记录”工具慢一些。
这个优秀的线程展示了很多不同的东西： 在 Windows 上与 Subversion 集成时使用哪些工具？
WinMerge 和 BeyondCompare 都在该线程中提到，但我们主要感兴趣的是 < em>差异。
是否有任何充分的理由从 TortoiseMerge 进行更改，即使是为了更快的差异？
谢谢。
We've recently "upgraded" from Visual SourceSafe to SVN based on recommendations on this site. Our current source control set-up is: TortoiseSVN with VisualSVN. We're very happy with it so far, but I was wondering if there's any additional benefits from using a different diff/merge tool than the one included (TortoiseMerge).
TortoiseMerge seems pretty capable, but also quite a bit slower than VSS's "View History" tool.
This excellent thread shows a lot of different things: What tools do you use when integrating with Subversion on Windows?
WinMerge and BeyondCompare are both mentioned in that thread, but we're mainly interested in diffs.
Are there any good reasons to change up from TortoiseMerge, even for the purpose of quicker diffs?
Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（5）
WinMerge 也可以进行比较，我个人比 TortoiseMerge 更喜欢它。
WinMerge does diffs as well, and I personally prefer it over TortoiseMerge.
我专门使用 BeyondCompare 进行比较和合并。事实上，它通过插件理解不同的文件格式，这对我来说非常有吸引力。例如，如果您有存储在 svn 中的图形，BeyondCompare 可以向您显示图像的基于 XOR 的差异。相当光滑！
哦，说到速度，我发现它在我的系统上速度相当快。
I exclusively use BeyondCompare for diffing and merging. The fact that it understands different file formats via plugins makes it very compelling for me. For instance, if you have graphics stored in svn, BeyondCompare can show you an XOR-based difference of the images. Pretty slick!
Oh as for speed, I find it quite speedy on my systems.
我真的很喜欢 Araxis Merge 进行差异的方式，并且比 TortoiseMerge 更喜欢它。我是一个非常喜欢视觉的人，与 WinMerge 和 BeyondCompare 相比，我更喜欢 Araxis Merge 的视觉表现。
Araxis Merge 还可以与 TortoiseSVN 一起使用来进行差异、合并和应用补丁。
I really like how Araxis Merge does the diffs, and prefer it over TortoiseMerge. I'm a very visually inclined person, and I prefer Araxis Merge's visual representation over WinMerge and BeyondCompare.
Araxis Merge can also be used with TortoiseSVN for diff, merges, and applying patches.
我使用 KDiff3 并且我不得不说我比 WinMerge 和 TortoiseMerge 更喜欢它！一探究竟。
I use KDiff3 and I have to say I prefer it over WinMerge and TortoiseMerge! Check it out.
几年前我发布了如何使用 SourceGear 的 Vault 的 DiffMerge 工具。它非常干净，与 VSS 早期的风格相似。
http://eduncan911.com/blog/living-with-subversion- part-3.aspx
这里的其他答案也有许多其他很好的建议。
但最近，我开始喜欢内置的 TortoiseMerge，因为我可以在合并时直接编辑合并的文件。似乎其他合并工具不允许我实时编辑合并文件。我必须手动合并、保存和打开。
I posted a few years ago how to use SourceGear's Vault's DiffMerge tool. It's very clean, and similar to VSS's style from way back in the day.
http://eduncan911.com/blog/living-with-subversion-part-3.aspx
The other answers here have a number of other great suggests as well.
But more recently, I have learned to like the built-in TortoiseMerge for the single reason that I can edit the merged file directly while merging. Seems other merge tools didn't allow me to edit the merging file in real time. I had to merge, save, and open manually.