Patchwork [08,of,14] merge: use util.removepath for removing moved files

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 13, 2013, 7:02 p.m.
Message ID <20c93961481db4980e9f.1358103763@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/583/
State Superseded
Headers show

Comments

Mads Kiilerich - Jan. 13, 2013, 7:02 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1358102468 -3600
# Node ID 20c93961481db4980e9ff08e34e92268974d12b6
# Parent  aff4835b27c68e1525be62ab7d9453d52a501808
merge: use util.removepath for removing moved files

- more like how removed files are removed.
Matt Mackall - Jan. 13, 2013, 7:38 p.m.
On Sun, 2013-01-13 at 20:02 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <mads@kiilerich.com>
> # Date 1358102468 -3600
> # Node ID 20c93961481db4980e9ff08e34e92268974d12b6
> # Parent  aff4835b27c68e1525be62ab7d9453d52a501808
> merge: use util.removepath for removing moved files

s/removepath/unlinkpath/

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -367,7 +367,7 @@  def applyupdates(repo, actions, wctx, mc
         if os.path.lexists(repo.wjoin(f)):
             repo.ui.debug("removing %s\n" % f)
             audit(f)
-            os.unlink(repo.wjoin(f))
+            util.unlinkpath(repo.wjoin(f))
 
     numupdates = len(actions)
     for i, a in enumerate(actions):