diff -r 4ef4e3c3c006 -r e0c1328df872 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Thu Mar 05 15:52:07 2015 -0600 +++ b/mercurial/cmdutil.py Thu Mar 05 22:16:28 2015 -0800 @@ -2071,6 +2071,7 @@ % join(subpath)) # warn about failure to delete explicit files/dirs + deleteddirs = scmutil.dirs(deleted) for f in m.files(): def insubrepo(): for subpath in wctx.substate: @@ -2078,7 +2079,8 @@ return True return False - if f in repo.dirstate or f in wctx.dirs() or f == '.' or insubrepo(): + isdir = f in deleteddirs or f in wctx.dirs() + if f in repo.dirstate or isdir or f == '.' or insubrepo(): continue if repo.wvfs.exists(f):