9

What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution?

In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts.

The default parameters are:

"${yours}" "${theirs}" "${base}" "${merged}"

And it suggests TortoiseMerge settings of this:

/theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"

But what is the appropriate config for Beyond Compare?

Peter Boughton
  • 110,170
  • 32
  • 120
  • 176

3 Answers3

5

Looks like this is correct:

"${theirs}" "${yours}" "${base}" "${merged}"

Based on this forum post: http://www.scootersoftware.com/vbulletin/showthread.php?t=368#4

To label the sections appropriately, and run BC in a separate (solo) instance, it's this:

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

Multiple lines used above for readability, replace linebreaks with spaces for use, i.e.

 "${theirs}" "${yours}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${yours})" /outputtitle="Merged (${merged})" /solo
Peter Boughton
  • 110,170
  • 32
  • 120
  • 176
  • I try your solution, and remove the linebreaks to make it in one line, but it also cannot work. Any mistake? – Autobots Feb 11 '14 at 08:41
  • None that I'm aware of - I set this up again a little back and it appeared to work. You do need to replace linebreaks with spaces rather than just remove them though - did you do that? – Peter Boughton Feb 11 '14 at 09:39
  • Thanks for your quick reply. I have replace linebreaks with spaces, but it still cannot work. The code is `"${theirs}" "${yours}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${yours})" /outputtitle="Merged (${merged})" /solo` – Autobots Feb 11 '14 at 09:50
  • Hmmm, dunno then. Probably worth double-checking on the [Scooter Software forums](http://www.scootersoftware.com/vbulletin/) in case anything has changed? – Peter Boughton Feb 11 '14 at 10:00
4

Also check out http://beyondcvs.sourceforge.net/ for an eclipse/Beyond Compare plugin. (from: http://www.scootersoftware.com/support.php?zz=kb_vcs)

Chris
  • 1,419
  • 14
  • 17
  • This is nice, but they lack the option to "compare with base from working copy", which is probably the most basic and frequently used comparison when working with SVN. Besides, it doesn't replace the default "compare" commands, but rather adds its own commands. I'll stick with manual configuration. – Yodan Tauber May 06 '14 at 19:01
  • @YodanTauber have you verified that the plugin doesn't do what you want? It's been a long time since I've used svn, eclipse, or Beyond Compare, but I'm wondering if Compare With -> Local History doesn't compare the working copy with the base revision. – Chris May 07 '14 at 13:28
  • I used the latest version of BeyondCVS, and it didn't have that feature (though it has been suggested: http://sourceforge.net/p/beyondcvs/feature-requests/10/ ). Compare with Local History is not the same. – Yodan Tauber May 07 '14 at 13:35
1

AnkhSVN uses

For 3-way diff:

"$(ProgramFiles)\Beyond Compare 3\BComp.exe" "$(Mine)" "$(Theirs)" "$(Base)" "$(Merged)" /title1="$(MineName)" /title2="$(TheirsName)" /title3="$(BaseName)" /title4="$(MergedName)"

Or for 2-way:

"$(ProgramFiles)\Beyond Compare 3\BComp.exe" "$(Mine)" "$(Theirs)" /mergeoutput="$(Merged)" /title1="$(MineName)" /title2="$(TheirsName)"

You can probably tweak this to Subclipse's format.

Bert Huijben
  • 19,525
  • 4
  • 57
  • 73