changeset 25301 | caaf4045eca8 |
parent 25283 | 19d0e5efa6ca |
child 25362 | 20ad936ac5d2 |
--- a/mercurial/match.py Sat May 23 21:18:47 2015 -0700 +++ b/mercurial/match.py Wed May 27 13:28:16 2015 -0400 @@ -50,7 +50,7 @@ for kind, pat, source in kindpats: if kind == 'subinclude': - sourceroot = pathutil.dirname(source) + sourceroot = pathutil.dirname(util.normpath(source)) pat = util.pconvert(pat) path = pathutil.join(sourceroot, pat)