Announcement

Collapse
No announcement yet.

TortoiseHg integration

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • TortoiseHg integration

    Somehow I cannot set it up correctly. Any help appreciated!

    Thanks,
    Herbert

  • #2
    Where exactly is your problem then?
    I must confess, that I have no experience with TortoiseHg but with TortoiseSVN. And there the integration of BC works perfectly ...


    Bye
    Christoph
    Last edited by chrroe; 17-Nov-2010, 01:39 AM. Reason: typo

    Comment


    • #3
      It seems TortoiseHg has little to do with TortoiseSVN, and more in line with another project: Mercurial

      I attempted to configure TortoiseHg, and it looks doable, but found little documentation. It seems that TortoiseHg is early in development, and does not have extensive Help.

      Do you know of any good sources of information on the project, or would the SourceForge's forum be the best place to ask for assistance?
      Aaron P Scooter Software

      Comment


      • #4
        Documentation is still sketchy. This is what I've learned from trial and error, to help those who stumble across this via Google.

        I'm using still using Windows XP; I have no idea if this works on Vista. I also installed BC3 with the single user option and did a stock install of TortoiseHg 0.4.

        Edit %USERPROFILE%\Mercurial.ini and add these lines:

        Code:
        [extdiff]
        cmd.bcomp = <BC3 install location>\BCompare.exe
        opts.bcomp = /ro
        
        [merge-tools]
        bcomp.executable = <BC3 install location>\BComp
        bcomp.args = $local $other $base $output
        bcomp.priority = 1
        Of course, replace <BC3 install location> with the full path of the install folder for BC3 (C:\...). For the merge, the arguments put your changes ($local) in the left pane, the common ancestor ($base) in the center and the conflicting file ($other) in the right pane. Reorder the first three args to suit your taste.

        Note that the merge uses BComp while the diff uses BCompare.exe. Using either BComp.exe or BComp.com for the diff will cause TortoiseHg to toss up an error dialog complaining it can't delete some temp folder.

        Next, check if you have [ui] and [tortoisehg] sections in the ini file. If not, insert those sections. Then add these lines:

        Code:
        [ui]
        merge = bcomp
        
        [tortoisehg]
        vdiff = bcomp
        Save the ini file and you're set to go with BC3 as your visual diff and merge tool.

        Comment


        • #5
          Thanks for the detailed steps. We'll add this to our VCS knowledge base article.
          ZoŽ P Scooter Software

          Comment


          • #6
            Has anyone managed to get this to work for BeyondCompare 2 yet? I tried substituting the paths for the BC2 paths, but it didn't work.

            Comment


            • #7
              Hello John,

              For Diff or Merge? BC3 Pro has a 3way Merge session that is not available in BC2. For BC2 you would need to use a combination of the Text Compare (2way) and a /savetarget parameter so that saving saves to a 3rd location. BC2 cannot accept a Left,Right, and Ancestor to compare and a 4th output.

              http://www.scootersoftware.com/support.php?zz=kb_vcs
              Aaron P Scooter Software

              Comment

              Working...
              X