branch | stable |
changeset 24857 | d8505bfe4825 |
parent 24845 | 8133494accf1 |
child 24864 | bff42a92012e |
--- a/mercurial/cmdutil.py Mon Apr 27 11:11:26 2015 -0500 +++ b/mercurial/cmdutil.py Sat Apr 25 23:54:31 2015 -0400 @@ -3084,7 +3084,10 @@ repo.dirstate.drop(f) for f in actions['remove'][0]: audit_path(f) - util.unlinkpath(repo.wjoin(f)) + try: + util.unlinkpath(repo.wjoin(f)) + except OSError: + pass repo.dirstate.remove(f) for f in actions['drop'][0]: audit_path(f)