I want to have the diff results window show in the task bar, in开发者_C百科stead of being a floating visual studio dialog item. Can I do this?
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
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)"
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.
精彩评论