Changing the behavior of Ankhsvn diff

Question

I want the diff results window to display in the taskbar, and not as an element of a dialog element with a floating visual studio. Can I do it?

Answer 1

Go to Tools > Options > Source Control > Subversion User Toolsto see which Diff / Merge features are supported.

Download your favorite merge tool (if you haven’t already done so for other purposes). My favorite is SourceGear DiffMerge.

Go to the configuration page again and select a tool from the drop-down list. It will be automatically detected by AnkhSvn

Answer 2

Visual Studio 2008. 64- Araxis Win7x64.

Diff:

 "$(HostProgramFiles)\Araxis\Araxis Merge\compare.exe" /max /wait  "$(Base)" "$(Mine)" /title1:"$(BaseName)" /title2:"$(MineName)"

VS2010.

, :

"$(HostProgramFiles)\Araxis\Araxis Merge\compare.exe" /a2 /max /wait /3 /title1:"$(TheirName)" /title2:"$(BaseName)" /title3:"$(MineName)" "$(Theirs)" "$(Base)" "$(Mine)" "$(Merged)"

Answer 3

I prefer the VS2010 dispersion tool. You can easily set it to compare and merge.

For an external diff tool:

"$(ProgramFiles)\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe" "$(Base)" "$(Mine)"

External merge tool:

"$(ProgramFiles)\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe" /merge $(Theirs) $(Mine) $(Base) $(Merged)

And, fortunately, it appears on the taskbar.