Change Ankhsvn diff behavior

Asked 21/12, 2009 at 20:57 Answered 23/10, 2012 at 19:52

Solved visual-studio-2008 diff ankhsvn

I want to have the diff results window show in the task bar, instead of being a floating visual studio dialog item. Can I do this?

Counterwork answered 21/12, 2009 at 20:57 Comment(3)

According to johnnycoder.com/blog/2008/07/22/getting-started-with-ankhsvn (QuickStart section 3) you can specify an external diff tool via Tools > Options > Source Control > Subversion. That's not showing for me, but maybe you'll have more luck... – Livelihood 21/12, 2009 at 21:15

It's under Tools > Options > Source Control > Subversion User Tools for me. – Counterwork 21/12, 2009 at 21:46

Just a side note, but to control whether those VS diff windows float, in the "Subversion User Tools" settings page, you can check the "Create Visual Studio Diff/Merge documents floating" option. Having this disabled can be problematic because in some situations the diff window can be docked behind modal dialogs (like when you open a diff from a Commit window in an integrated tool like AnkhSvn), making it totally unusable. – Gorges 19/3, 2021 at 11:3

Go to Tools > Options > Source Control > Subversion User Tools to see what Diff/Merge tools are supported.

Download your favorite merge tool (if you didn't already do that for other purposes). My favorite is SourceGear DiffMerge.

Go to the configuration page again, and select your tool from the drop down. It'll be automatically detected by AnkhSvn

Aqueduct answered 21/12, 2009 at 22:16 Comment(0)

Here's what I have for Visual Studio 2008. It failed to detect my installation of 64-bit Araxis on Win7x64.

External Diff Tool:

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

Haven't tried with VS2010 yet.

This should be the command for Merging, but I haven't tested it yet:

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

Heyerdahl answered 21/10, 2010 at 14:51 Comment(0)

I prefer VS2010 diffmerge tool. You can set it for compare and merge easily.

For 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 luckily it appears on Taskbar.

Sheepdip answered 23/10, 2012 at 19:52 Comment(0)

Recommended topics

Hot tags