在Eclipse中使用Beyond Compare来合并Subversion [英] Using Beyond Compare inside Eclipse for Merging in Subversion

问题描述

我想在Eclipse中使用Beyond Compare。当前的问题是，本机差异和合并工具不允许自定义差异，所以有太多的区别。超越比较有适当的定制，但我无法集成工具。我尝试了以下内容：

1. 使用Eclipse插件 http://beyondcvs.sourceforge.net/ 但是我无法在Eclipse中配置Subversive来使用该插件，并且该插件没有将自身整合到Subversive的合并操作中。


2. 尝试将Beyond Compare集成为diff查看器（请参阅Eclipse Window> Preferences> Team> SVN> Diff Viewer）。当做同步时，我配置的diff查看器根本没有被使用。我遵循了 http://www.scootersoftware.com/download.php找到的信息？ c = kb_vcs 在tortoisesvn下，并根据Subversive插件的需要更改语法。

有没有人成功在Eclipse中整合Beyond Compare Subversion？我已经找到类似的问题如何配置超越比较3对于Eclipse冲突解决？，但它对我来说不起作用（也许Subversionive和Subclipse之间的区别？）。

---

添加：
我按照@Tom Clift的步骤（感谢很多），差异现在正在工作，合并有点困难。我已经做了以下步骤来取得最终成功：

1. 配置为答案所记录。




3. 开始合并操作： Team> ;合并...>标签页URL>网址字段：<分支网址>和单选按钮从复制开始


4. 按 Ok 时会弹出一个对话框，询问是否可以打开同步视图。


5. 同步显示显示所有更改，当我选择一个时，会显示一个菜单条目打开外部比较编辑器比较

解决方案

配置Eclipse的步骤（使用3.7（靛蓝）通过4.4（Luna） ））， Subversive 使用超越比较作为默认的差异和合并工具（可能与其他版本一起使用）：

注意：根据 MattPassell的评论，似乎在具有空格的OS X（和Linux？）上是一个突出的问题在路径和争论中。

1. 首选项→团队→SVN→差异查看器


2. 添加...


3. 扩展名或MIME类型 *


4. 差异程序参数→程序路径：输入Beyond Compare二进制文件的路径（没有参数）。例如：
   
   
   
   • 操作系统X： / Users / tom / bin / bcomp （这是一个符号链接到以避免路径中的空格）
   
   
   • Windows： C： \程序文件（x86）\Beyond比较3\BComp.exe
   
   
   



5. 
   差异程序参数（框）：
   
   
   
   • 
     OS X：
     

       $ {base} $ {mine} -lefttitle = Base -righttitle = Local  

     
     

   
   
   • 
     Windows：
     

      $ {base}$ {mine}
      / lefttitle =Base $ {base}
      / righttitle =Local $ {mine}
       

     
     

   
   
   
   


6. 合并程序参数→程序路径：再次进入二进制路径。


7. 
   合并程序参数（框）：
   
   
   
   • 
     OS X：
     

       $ {thems } $ {mine} $ {base} $ {merged} 
      -lefttitle =传入
      -centertitle = Base 
      -righttitle =本地
      -outputtitle =合并 

     
     

   
   
   • 
     Windows：
     

      $ {theirs}$ {mine}$ {base}$ 
      / lefttitle =Incoming（$ {theirs}）
      / centertitle =Base（$ {base}）
      / righttitle =Local（$ {mine} ）
      / outputtitle =合并（$ {合并}）
       

     
     

   
   <
   
   
   • 确定
   
   

I尝试并未能配置Beyond Compare作为Subclipse的差异工具（似乎只有外部工具配置合并/冲突）。

I would like to use Beyond Compare inside Eclipse. The problem at hand is, that the native diff and merge tool does not allow to customize the diff enough, so there are too much differences. Beyond Compare has the right customization for that, but I could not integrate the tool. I have tried the following:

1. Use the Eclipse Plugin http://beyondcvs.sourceforge.net/ But I could not configure Subversive inside Eclipse to use that plugin, and the plugin does not integrate itself into the merge action of Subversive.
2. Tried to integrate Beyond Compare as the diff viewer (see Eclipse Window > Preferences > Team > SVN > Diff Viewer). When doing then a synchronize, the diff viewer I configured was not used at all. I followed the information found at http://www.scootersoftware.com/download.php?c=kb_vcs under the point "tortoisesvn" and changed the syntax as needed by the Subversive plugin.

Has anyone succeeded in integrating Beyond Compare in Eclipse for Subversion? I have found the similar question How to configure Beyond Compare 3 for Eclipse conflict resolution?, but it did not work for me (perhaps the difference between Subversive and Subclipse?).

---

Addition: I followed the steps of @Tom Clift (thank's a lot), and the diff is now working, the merge was a little bit more difficult. I have done the following steps to final success:

1. Configured as documented by the answer.
2. Changed something on a branch and commited that.
3. Switched to the trunk.
4. Started there the merge operation: Team > Merge... > Tab URL > URL Field: <branch URL> and Radio button "Start from copy"
5. When pressing Ok, a dialog pops up that ask if it is ok to open the "Synchronize View".
6. The synchronize perspecitve shows all changes, and when I select one, there is a menu entry "Open in external compare editor" that opens Beyond Compare.

解决方案

Steps for configuring Eclipse (tested with 3.7 (Indigo) through 4.4 (Luna)) with Subversive to use Beyond Compare as the default diff and merge tool (may work with other versions too):

Note: per MattPassell's comment there seems to be an outstanding issue on OS X (and Linux?) with spaces in paths and arguments. The config below for OS X works around this by avoiding spaces.

1. Preferences → Team → SVN → Diff Viewer
2. Add...
3. Extension or mime-type: *
4. Diff program arguments → Program Path: enter the path for the Beyond Compare binary (with no arguments). E.g.:
   • OS X: /Users/tom/bin/bcomp (which is a symlink to /Applications/Beyond Compare.app/Contents/MacOS/bcomp to avoid spaces in the path)
   • Windows: C:\Program Files (x86)\Beyond Compare 3\BComp.exe
5. Diff program arguments (box):
   • OS X:

     ${base} ${mine} -lefttitle=Base -righttitle=Local

   • Windows:

     "${base}" "${mine}"
     /lefttitle="Base ${base}"
     /righttitle="Local ${mine}"
     

6. Merge program arguments → Program path: path to binary again.
7. Merge program arguments (box):
   • OS X:

     ${theirs} ${mine} ${base} ${merged}
     -lefttitle=Incoming
     -centertitle=Base
     -righttitle=Local
     -outputtitle=Merged

   • Windows:

     "${theirs}" "${mine}" "${base}" "${merged}"
     /lefttitle="Incoming (${theirs})"
     /centertitle="Base (${base})"
     /righttitle="Local (${mine})"
     /outputtitle="Merged (${merged})"
     

8. OK

I have tried and failed to configure Beyond Compare as a diff tool with Subclipse (it seems to only have external tool configuration for merge/conflict).

这篇关于在Eclipse中使用Beyond Compare来合并Subversion的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！