1. TortoiseHg
  2. TortoiseHg
  3. thg


Angel Ezquerra  committed 9323895

resolve: normalize paths before calling resolve

This fixes a problem where the resolve command could silently fail when the path
separators do not match the OS standard path separator. This happened because
some external merge tools are not able to open the file unless the path
separators are correct.

  • Participants
  • Parent commits e8dadcc
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/resolve.py

View file
  • Ignore whitespace
             cmd = cmdline + ['--repository', curroot, '--']
             for root, wfile in selected:
                 if root == curroot:
-                    cmd.append(os.path.join(root, wfile))
+                    cmd.append(os.path.normpath(os.path.join(root, wfile)))
             selected = [(r, w) for r, w in selected if r != curroot]
         if cmdlines: