Mercurial > hg
changeset 31310:431d4f73249e
merge: use repo.wvfs.unlinkpath
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 14 Jan 2015 01:15:26 +0100 |
| parents | 8908f985570c |
| children | f59b6cf663a9 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Jan 14 01:15:26 2015 +0100 +++ b/mercurial/merge.py Wed Jan 14 01:15:26 2015 +0100 @@ -1060,8 +1060,7 @@ yields tuples for progress updates """ verbose = repo.ui.verbose - unlink = util.unlinkpath - wjoin = repo.wjoin + unlinkpath = repo.wvfs.unlinkpath audit = repo.wvfs.audit try: cwd = pycompat.getcwd() @@ -1076,7 +1075,7 @@ repo.ui.note(_("removing %s\n") % f) audit(f) try: - unlink(wjoin(f), ignoremissing=True) + unlinkpath(f, ignoremissing=True) except OSError as inst: repo.ui.warn(_("update failed to remove %s: %s!\n") % (f, inst.strerror))