changeset 16151 | a01d2fb5ba65 |
parent 16128 | 004982e5d782 |
parent 16144 | 4546a8513dcd |
child 16208 | 85db991780b7 |
--- a/mercurial/localrepo.py Wed Feb 22 12:30:15 2012 +0100 +++ b/mercurial/localrepo.py Wed Feb 22 17:36:33 2012 -0600 @@ -1371,7 +1371,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