Jump to content

Directory diff not working in TortoiseHg

Recommended Posts

I configured SemanticMerge in mercurial.ini as per https://users.semanticmerge.com/documentation/how-to-configure/semanticmerge-configuration-guide.shtml#HowtoconfigurewithMercurial,

resulting in:

rebase = 
mq = 
purge = 
extdiff =

cmd.semanticdiff = C:\Users\My.Name\AppData\Local\semanticmerge\semanticmergetool.exe
opts.semanticdiff = $parent $child
cmd.kdiff3 = kdiff3.exe
opts.kdiff3 = $parent $child

semantic.executable = C:\Users\My.Name\AppData\Local\semanticmerge\semanticmergetool.exe
semantic.args=-b=$base -s=$local -d=$other -r=$output -l=csharp -edt="kdiff3.exe ""#sourcefile"" ""#destinationfile""" -emt="kdiff3.exe ""#basefile"" ""#sourcefile"" ""#destinationfile"" --L1 ""#basesymbolic"" --L2 ""#sourcesymbolic"" --L3 ""#destinationsymbolic"" -o ""#output"""
kdiff3.executable = kdiff3.exe
kdiff3.args = $base $local $other -o $output

**.cs = semantic
**.** = kdiff3

**.cs = semanticdiff
**.** = kdiff3

vdiff = semanticdiff
username = My.Name
merge = semantic

When I do a "Visual Diff" of two revisions from the TortoiseHG workbench:

  • "semanticdiff" is selected as tool (as expected)
  • The button to launch a "directory diff" is grayed out (<- This is what bothers meĀ :) )
  • If I double-click a (.cs) file in the list, SemanticMerge launches and shows the diff
  • This is also true if there are only .cs files in the diff

If I do the same with two revisions that differ only in one (.cs) file, SemanticMerge launches immediately.

How can I make the "directory diff" work?


Share this post

Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.


  • Create New...