380 repo.ui.note(_("removing %s\n") % f) |
380 repo.ui.note(_("removing %s\n") % f) |
381 audit(f) |
381 audit(f) |
382 if f == '.hgsubstate': # subrepo states need updating |
382 if f == '.hgsubstate': # subrepo states need updating |
383 subrepo.submerge(repo, wctx, mctx, wctx, overwrite) |
383 subrepo.submerge(repo, wctx, mctx, wctx, overwrite) |
384 try: |
384 try: |
385 util.unlinkpath(repo.wjoin(f)) |
385 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
386 except OSError, inst: |
386 except OSError, inst: |
387 if inst.errno != errno.ENOENT: |
387 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
388 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
388 (f, inst.strerror)) |
389 (f, inst.strerror)) |
|
390 removed += 1 |
389 removed += 1 |
391 elif m == "m": # merge |
390 elif m == "m": # merge |
392 if f == '.hgsubstate': # subrepo states need updating |
391 if f == '.hgsubstate': # subrepo states need updating |
393 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
392 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
394 overwrite) |
393 overwrite) |