##// END OF EJS Templates
ignore: fix path concatenation of .hgignore on Windows...
Yuya Nishihara -
r25875:511e1949 stable
parent child Browse files
Show More
@@ -5,7 +5,7 b''
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 import copy, re
8 import copy, os, re
9 import util, pathutil
9 import util, pathutil
10 from i18n import _
10 from i18n import _
11
11
@@ -289,7 +289,7 b' class match(object):'
289 continue
289 continue
290 elif kind == 'include':
290 elif kind == 'include':
291 try:
291 try:
292 fullpath = pathutil.join(root, pat)
292 fullpath = os.path.join(root, util.localpath(pat))
293 includepats = readpatternfile(fullpath, self._warn)
293 includepats = readpatternfile(fullpath, self._warn)
294 for k, p, source in self._normalize(includepats, default,
294 for k, p, source in self._normalize(includepats, default,
295 root, cwd, auditor):
295 root, cwd, auditor):
General Comments 0
You need to be logged in to leave comments. Login now