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:
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:
Team > Merge... > Tab URL > URL Field: <branch URL> and Radio button "Start from copy"
Ok
, a dialog pops up that ask if it is ok to open the "Synchronize View".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.
/Users/tom/bin/bcomp
(which is a symlink to /Applications/Beyond Compare.app/Contents/MacOS/bcomp
to avoid spaces in the path)C:\Program Files (x86)\Beyond Compare 3\BComp.exe
${base} ${mine} -lefttitle=Base -righttitle=Local
"${base}" "${mine}"
/lefttitle="Base ${base}"
/righttitle="Local ${mine}"
${theirs} ${mine} ${base} ${merged}
-lefttitle=Incoming
-centertitle=Base
-righttitle=Local
-outputtitle=Merged
"${theirs}" "${mine}" "${base}" "${merged}"
/lefttitle="Incoming (${theirs})"
/centertitle="Base (${base})"
/righttitle="Local (${mine})"
/outputtitle="Merged (${merged})"
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).