Page 2 of 2 FirstFirst 12
Results 11 to 14 of 14
  1. #11
    Join Date
    May 2014
    Posts
    2

    Default

    Hi Aaron,

    Thanks for the fast reply. Yes, the Stack Overflow screenshot you reference is similar to what I'm trying to get Beyond Compare 3 to replace. So the only way to choose different revisions from a tree for Beyond Compare is to Control Click two files and choose Visual Diff? Isn't choosing files from a tree a feature request for a new version of Beyond Compare?

    Also does my mercurial.ini look correct since I've seen so many variations? Here is my latest version:

    [tortoisehg]
    vdiff=bc3
    ui.language=en_US

    [ui]
    username=Brandon Hofmann
    merge=bc3

    [merge-tools]
    ; Windows version of Beyond Compare
    bc3.priority=-1
    bc3.executable=E:\MyApps\PortableApps\Beyond Compare 3\BCompare.exe
    bc3.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solo
    bc3.premerge=False
    bc3.regkey=Software\Scooter Software\Beyond Compare 3
    bc3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
    bc3.regname=ExePath
    bc3.gui=True
    bc3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
    bc3.diff3args=$parent1 $parent2 $child /lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
    bc3.dirdiff=True

    [web]
    cacerts=${PAL:AppDir}\TortoiseHg\HgRc.d\CACert.pem

    Thanks for your help,

    Brandon

  2. #12
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,788

    Default

    Our supported Mercurial configuration is here:
    http://www.scootersoftware.com/suppo..._vcs#mercurial

    I suspect we do not support the dirdiff command unless Mercurial outputs the dir to the file system, like Git does.

    As for overriding the Compare File Revisions command, that is out of our hands. TortoiseHG would need to add a button to call an external tool based on the selection, or otherwise expose the information or configure an external tool. It would be a feature request with them to expose this information, at which point we might be able to be used as the external tool.
    Aaron P Scooter Software

  3. #13
    Join Date
    Jan 2013
    Posts
    4

    Default

    As far as I can tell, TortoiseHG supports BC4 natively since version 2.11.2:

    https://bitbucket.org/tortoisehg/thg...ortoisehg-2112

    I'd recommend updating your how-to to reflect the change.

  4. #14
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,788

    Default

    Thanks for the report. We'll get them updated.
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •