branch | stable |
changeset 25870 | 3de48ff62733 |
parent 25662 | ff5172c83002 |
child 25875 | 511e1949d557 |
--- a/mercurial/match.py Fri Jul 24 16:43:21 2015 -0700 +++ b/mercurial/match.py Fri Jul 24 16:44:52 2015 -0700 @@ -289,7 +289,8 @@ continue elif kind == 'include': try: - includepats = readpatternfile(pat, self._warn) + fullpath = pathutil.join(root, pat) + includepats = readpatternfile(fullpath, self._warn) for k, p, source in self._normalize(includepats, default, root, cwd, auditor): kindpats.append((k, p, source or pat))