branch | stable |
changeset 16144 | 4546a8513dcd |
parent 16116 | ce0ad184f489 |
child 16151 | a01d2fb5ba65 |
child 16198 | fa8488565afd |
--- a/mercurial/localrepo.py Thu Feb 23 00:07:54 2012 +0900 +++ b/mercurial/localrepo.py Thu Feb 23 00:07:54 2012 +0900 @@ -1351,7 +1351,9 @@ if not parentworking: def bad(f, msg): - if f not in ctx1: + # 'f' may be a directory pattern from 'match.files()', + # so 'f not in ctx1' is not enough + if f not in ctx1 and f not in ctx1.dirs(): self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) match.bad = bad