Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 31318:8908f985570c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vfs: use repo.wvfs.unlinkpath
author Mads Kiilerich <madski@unity3d.com>
date Wed, 14 Jan 2015 01:15:26 +0100
parents 11831d755b51
children 431d4f73249e
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Mar 08 18:11:41 2017 -0500
+++ b/mercurial/merge.py	Wed Jan 14 01:15:26 2015 +0100
@@ -1190,7 +1190,7 @@
         if os.path.lexists(repo.wjoin(f)):
             repo.ui.debug("removing %s\n" % f)
             audit(f)
-            util.unlinkpath(repo.wjoin(f))
+            repo.wvfs.unlinkpath(f)
 
     numupdates = sum(len(l) for m, l in actions.items() if m != 'k')
 
@@ -1247,7 +1247,7 @@
         repo.ui.note(_("moving %s to %s\n") % (f0, f))
         audit(f)
         repo.wwrite(f, wctx.filectx(f0).data(), flags)
-        util.unlinkpath(repo.wjoin(f0))
+        repo.wvfs.unlinkpath(f0)
         updated += 1
 
     # local directory rename, get