comparison tests/failfilemerge.py @ 34965:f445b10dc7fb stable

pathutil: use util.pathto() to calculate relative cwd in canonpath() os.path.relpath() exploded if the 'root' and 'cwd' directories had different drive letters. I noticed this in TortoiseHg when typing a fileset into the filter, and it kept complaining until the closing '()' was typed. This was reproducible on the command line with: $ cd /d $ hg -R /c/Users/Matt/Projects/hg files 'set:e' Traceback (most recent call last): ... File "mercurial\pathutil.pyc", line 182, in canonpath File "ntpath.pyc", line 529, in relpath ValueError: path is on drive c:, start on drive d:
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 02 Nov 2017 20:35:31 -0400
parents c0ce60459d84
children 2372284d9457
comparison
equal deleted inserted replaced
34955:95f54cec0025 34965:f445b10dc7fb