需要帮助使用 Eclipse 配置外部差异 [英] Need help configuring external diff with Eclipse

问题描述

我正在尝试设置我的开发环境，并且在我的 Mac 上使用 Eclipse 运行了 SVN(使用 Subclipse).但是，当我单击我已更改的文件并转到比较 -> 来自存储库的最新版本时，我注意到我正在获得(我认为是)低于标准的差异工具.

I am trying to set up my dev environment and I got SVN running with Eclipse on my mac (with Subclipse). However, when I click on a file I've changed and go to Compare With -> Latest From Repository, I noticed I was getting (what I think is) a sub-par diff tool.

所以，我去 Preferences -> Team -> SVN -> Diff/Merge 来配置一个外部 diff 工具(称为DiffMerge").但是，无论我在外部"字段和参数"字段中输入什么，都无法使 DiffMerge 工具正常工作.

So, I went to Preferences -> Team -> SVN -> Diff/Merge to configure an external diff tool (called "DiffMerge"). However, no matter what I put in the "External" field and the "Parameters" field, I cannot get the DiffMerge tool to work.

例如，我在外部字段中尝试了/Applications/DiffMerge"(我现在将可执行文件直接放在 Applications 文件夹中)并设置了参数:${base}"${yours}".但是，当我返回修改后的文件并点击比较 -> 来自存储库的 Lates 时，我仍然得到相同的内置差异工具.

For example, I tried "/Applications/DiffMerge" in the External field (I put the executable directly in the Applications folder for now) and made the parameters: "${base}" "${yours}". However, when I return to my modified file and hit compare with -> Lates from repository, I still get the same built-in diff tool.

您可以向我指出的任何想法或资源将不胜感激(我一直在寻找 stackoverflow 的答案，但无济于事).

Any ideas or resources you could point me to would be greatly appreciated (I've been hunting around stackoverflow myself for answers but to no avail).

推荐答案

我最近开始使用 Mac，但遇到了同样的问题.按照 Chris 的建议，我让它为 DeltaWalker 工作.

I started using Mac recently and I faced the same problem. As suggested by Chris I got it working for DeltaWalker.

步骤:1.用svn安装BeyondCVS插件.这将确保在 Eclipse -> Preferences -> External Tools 下添加 BeyondCompare.

Steps : 1. Install BeyondCVS plugin with svn. This will ensure that BeyondCompare is added under Eclipse -> Preferences -> External Tools.

1. 打开 Eclipse -> 首选项 -> 外部工具 -> Beyond Compare.

1. Open Eclipse -> Preferences -> External Tools -> Beyond Compare.

在Path To Beyond Compare"中手动输入 Delta Walker 的安装文件夹，在我的机器上是/Applications/DeltaWalker.app/Contents/MacOS/DeltaWalker"

In the "Path To Beyond Compare" manually enter the installation folder for Delta Walker which on my machine is "/Applications/DeltaWalker.app/Contents/MacOS/DeltaWalker"

这篇关于需要帮助使用 Eclipse 配置外部差异的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！