在 Komodo IDE(6 或 7)中使用 Beyond Compare 3 作为 Diff 程序

发布于 2025-01-01 10:12:58 字数 1113 浏览 3 评论 0原文

我正在尝试将 Beyond Compare 3 集成到 Komodo IDE 7 中作为 Subversion 的 diff 程序。

我有 BC3 在 TortoiseSVN 中作为 diff 程序工作,但我不知道如何在 Komodo 中设置它。

Komodo IDE 未在 BC3 的已知设置中列出

http://www.scootersoftware.com /support.php?zz=kb_vcs.php

我还检查了 Activestate 论坛,但没有这样的运气

http://community.activestate.com/forum/subversion-external-diff-tool

我确实尝试使用 activestate 论坛上提到的批处理文件方法以及直接使用 Komodo 中的 diff 选项。当在 Komodo 中使用 Diff 设置并直接链接到 BC3 时,我只是在 3 窗口比较中获取正在处理的当前文件,我的目标是 2 窗口比较(颠覆主干和工作副本)。

我在 Komodo 中得到的最接近的是来自 BC3s 网站的 TortoiseSVN 字符串,但它给了我 3 个窗口,其中 2 个窗口具有相同的文件名。它还在比较期间将字符串“(工作副本)添加到我的文件末尾,并且无法加载文件,如果我手动远程它,我会得到 2 个相同文件的比较。

这是我在Diff 选项下的 Komodo 首选项

--diff-cmd "C:\\Program Files (x86)\\Beyond Compare 3\\BComp.exe"  %base %mine /title1=%bname /title2=%yname /leftreadonly

我无法在批处理文件中加载任何内容。

I am trying to integrate Beyond Compare 3 into Komodo IDE 7 as the diff program for Subversion.

I have BC3 working in TortoiseSVN as the diff program, but i cant figure out how to set it up in Komodo.

Komodo IDE is not listed in known setups for BC3

http://www.scootersoftware.com/support.php?zz=kb_vcs.php

I also checked the Activestate forums with no such luck

http://community.activestate.com/forum/subversion-external-diff-tool

I did try using the batch file method mentioned on the activestate forums as well as directly using the diff options in Komodo. When using the Diff setting in Komodo with a direct link to BC3 i just get the current file im working on in a 3 windowed compare, I am aiming for a 2 window compare (subversion trunk and working copy).

The closest i got in Komodo was with the TortoiseSVN string from BC3s website but it gave me 3 windows, 2 of which had the same file name in them. It also is adding the string "(Working Copy) to the end of my file during the compare and failing to load the file, if i manually remote this i get a comparison of 2 identical files.

This is the string I am using in the Komodo Preferences under Diff options

--diff-cmd "C:\\Program Files (x86)\\Beyond Compare 3\\BComp.exe"  %base %mine /title1=%bname /title2=%yname /leftreadonly

I cant get anything to load in the batch file.

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

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

发布评论

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

评论(2

月亮邮递员 2025-01-08 10:12:58

请改用运行命令;单击“Tools=>Run Command”,选择“Run In”选项旁边的“No Console”,将 BCompare.exe 位置添加到 PATH 环境变量中,使用“Browse”转到 TortoiseSVN 文档根目录按钮,然后运行应用程序: BCompare.exe %F %f

您还可以单击“运行命令”菜单中的“添加到工具箱”复选框,将其另存为右侧工具箱中的快捷方式。

Use a Run Command instead; Click Tools=>Run Command, select "No Console" next to the Run In option, add the BCompare.exe location to the PATH environment variable, go to the TortoiseSVN document root using the "Browse" button, then run the application: BCompare.exe %F %f

You can also click the "Add to Toolbox" checkbox in the Run Command menu to save it as a shortcut in the Toolbox on the right.

避讳 2025-01-08 10:12:58

有用

我正在尝试将 Beyond Compare 3 集成到 Komodo IDE 7 中作为 Subversion 的 diff 程序。

我使用 Git 和 Komodo 9,但我建议对于 SVN 和旧版本的 Komodo 这也应该有效(对于版本 6,请查看“How将 FileMerge 与 Komodo 6 IDE 集成?”)。

打开菜单“编辑>首选项...”,找到“源代码控制”并选择您的版本控制系统。选中“使用外部差异工具”。

使用 Git 的外部 diff 工具

比较文件:

运行外部比较实用程序

,您将为文件运行 Beyond Compare:

它不起作用

改用运行命令;单击“Tools=>Run Command”,选择“Run In”选项旁边的“No Console”,将 BCompare.exe 位置添加到 PATH 环境变量中,使用“Browse”按钮转到 TortoiseSVN 文档根目录,然后运行应用程序: BCompare.exe %F %f

我在 http://en.wikibooks.org/wiki/Komodo_Edit#Kdiff.2FBeyond_Compare。 2FX-Winmerge_Usage 也。但这对我不起作用。它不应该工作,因为它比较不合适的文件。让我们看看快捷方式的含义(请参阅内部帮助中的“插值快捷方式”):

%F当前文件的完整路径和名称

%f 当前文件的基本名称

例如,我按照上面的描述对当前文件运行 Beyond Compare 并获取这些变量的值:

%F = D:\Projects\Languages\Perl\_music\Music.pm
%f = Music.pm

它不会将文件与存储库的原始文件进行比较。

It works

I am trying to integrate Beyond Compare 3 into Komodo IDE 7 as the diff program for Subversion.

I use Git and Komodo 9, but I suggest for SVN and older version of Komodo this should works also (for version six please look at "How to integrate FileMerge with Komodo 6 IDE?").

Open menu "Edit > Preferences...", find "Source Code Control" and select your version control system. Check "Uses an external diff tool".

Use external diff tool for Git

Compare files:

Run external diff utility

and you will run Beyond Compare for your file:

Beyond Compare compares file with its history

It doesn't work

Use a Run Command instead; Click Tools=>Run Command, select "No Console" next to the Run In option, add the BCompare.exe location to the PATH environment variable, go to the TortoiseSVN document root using the "Browse" button, then run the application: BCompare.exe %F %f

I found that description in http://en.wikibooks.org/wiki/Komodo_Edit#Kdiff.2FBeyond_Compare.2FX-Winmerge_Usage also. But it don't work for me. And it shouldn't work, because it compares inappropriate files. Let's look what shortcuts mean (see "Interpolation Shortcuts" in internal help):

%F the full path and name of the current file

%f the basename of the current file

For instance, I ran Beyond Compare as described above for my current file and get value for these variables:

%F = D:\Projects\Languages\Perl\_music\Music.pm
%f = Music.pm

It doesn't compare file with repo's original.

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文