Show More
@@ -289,7 +289,8 b' class match(object):' | |||||
289 | continue |
|
289 | continue | |
290 | elif kind == 'include': |
|
290 | elif kind == 'include': | |
291 | try: |
|
291 | try: | |
292 |
|
|
292 | fullpath = pathutil.join(root, pat) | |
|
293 | includepats = readpatternfile(fullpath, self._warn) | |||
293 | for k, p, source in self._normalize(includepats, default, |
|
294 | for k, p, source in self._normalize(includepats, default, | |
294 | root, cwd, auditor): |
|
295 | root, cwd, auditor): | |
295 | kindpats.append((k, p, source or pat)) |
|
296 | kindpats.append((k, p, source or pat)) |
@@ -186,8 +186,9 b" Check using 'include:' in ignore file" | |||||
186 |
|
186 | |||
187 | Check recursive uses of 'include:' |
|
187 | Check recursive uses of 'include:' | |
188 |
|
188 | |||
189 | $ echo "include:nestedignore" >> otherignore |
|
189 | $ echo "include:nested/ignore" >> otherignore | |
190 | $ echo "glob:*ignore" > nestedignore |
|
190 | $ mkdir nested | |
|
191 | $ echo "glob:*ignore" > nested/ignore | |||
191 |
$ |
|
192 | $ hg status | |
192 | A dir/b.o |
|
193 | A dir/b.o | |
193 |
|
194 | |||
@@ -199,6 +200,13 b" Check recursive uses of 'include:'" | |||||
199 |
|
200 | |||
200 | $ mv goodignore otherignore |
|
201 | $ mv goodignore otherignore | |
201 |
|
202 | |||
|
203 | Check using 'include:' while in a non-root directory | |||
|
204 | ||||
|
205 | $ cd .. | |||
|
206 | $ hg -R ignorerepo status | |||
|
207 | A dir/b.o | |||
|
208 | $ cd ignorerepo | |||
|
209 | ||||
202 | Check including subincludes |
|
210 | Check including subincludes | |
203 |
|
211 | |||
204 | $ hg revert -q --all |
|
212 | $ hg revert -q --all |
General Comments 0
You need to be logged in to leave comments.
Login now