需要帮助使用 Eclipse 配置外部差异

发布于 2024-08-13 07:22:21 字数 472 浏览 6 评论 0原文

我正在尝试设置我的开发环境,并且我在我的 mac 上使用 Eclipse(使用 Subclipse)运行 SVN。但是,当我单击已更改的文件并转到“比较”->“最新的存储库中,我注意到我得到了(我认为是)一个低于标准的差异工具。

所以,我进入了首选项 ->团队-> SVN-> Diff/Merge 配置外部 diff 工具(称为“DiffMerge”)。但是,无论我在“外部”字段和“参数”字段中输入什么,我都无法使 DiffMerge 工具正常工作。

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

如果您能向我提供任何想法或资源,我将不胜感激(我自己一直在 stackoverflow 上寻找答案,但无济于事)。

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.

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.

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.

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).

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(4

动听の歌 2024-08-20 07:22:22

我最近开始使用 Mac,也遇到了同样的问题。按照克里斯的建议,我让它为 DeltaWalker 工作。

步骤:
1.使用svn安装BeyondCVS插件。这将确保BeyondCompare添加到Eclipse下->首选项->外部工具。

  1. 打开 Eclipse ->首选项->外部工具 ->超越比较。

  2. 在“超越比较的路径”中手动输入 Delta Walker 的安装文件夹,在我的机器上是“/Applications/DeltaWalker.app/Contents/MacOS/DeltaWalker”

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

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

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

  2. 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"

柳絮泡泡 2024-08-20 07:22:22

我相信 DiffMerge 是一个 .app,不是吗?在这种情况下,我认为您必须提供实际二进制文件的路径,该路径应该类似于:/Applications/DiffMerge.app/Contents/MacOS/DiffMerge。如果您在 Finder 中右键单击该应用程序并执行“显示内容”,它应该允许您像常规目录一样浏览它......或者您可以从命令行导航到它并找到您需要的二进制文件。

只是出于好奇 Subclipse 的内置工具有什么用? IMO 它是 OSX 上最好的 Diff/Merge - 但也许我错过了一些东西。

I beleive DiffMerge is a .app is it not? In that case i think you would have to give the path to actual binary which should be something like: /Applications/DiffMerge.app/Contents/MacOS/DiffMerge. If you right click on the app in Finder an do "Show Contents" it shoudl allow you to browse it like the regular directory it is... Or you can navigate into it from the command line and find the bianary you need.

Just out of curiosity whats worng with Subclipse's built in tool? IMO its the best Diff/Merge on OSX - but maybe im missing something.

戏舞 2024-08-20 07:22:22

我在 SVN 中使用 BeyondCVS 插件。尽管它的名字是这样的,但它同时适用于 Subclipse 和 Subversive。并且它将启动 BeyondCompare 以外的比较应用程序(我使用过 WinMerge),因此它可能与 Mac 上的 DiffMerge 一起使用。

I am using the BeyondCVS plugin with SVN. Despite its name, it works both Subclipse and Subversive. And it will launch comparison apps other than BeyondCompare, (I've used WinMerge), so it may work with DiffMerge on the Mac.

倚栏听风 2024-08-20 07:22:22

经过一些实验后我能够让它发挥作用。您需要欺骗 Subclipse 找到要打开的正确文件。

  1. 打开 Finder 并导航至 DiffMerge.app
  2. 右键单击​​ > “显示包内容”
  3. 导航到 Contents/MacOS/DiffMerge
  4. 右键单击​​ > “Make Alias”
  5. 将“DiffMerge alias”文件拖放到您的主文件夹中
  6. 在 Eclipse 中,选择别名文件作为外部 diff 程序
  7. 将参数设置为“-m -t1=Theirs -t2=Merged -t3=Mine -r =${合并} ${他们的} ${基础} ${你的}"

I was able to get this to work after some experimentation. You need to trick Subclipse into finding the right file to open.

  1. Open finder and navigate to DiffMerge.app
  2. Right click > "Show Package Contents"
  3. Navigate to Contents/MacOS/DiffMerge
  4. Right click > "Make Alias"
  5. Drag and Drop the "DiffMerge alias" file to your home folder
  6. In Eclipse, select the alias file as the external diff program
  7. Set the parameters to "-m -t1=Theirs -t2=Merged -t3=Mine -r=${merged} ${theirs} ${base} ${yours}"
~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文