Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use util.unlinkpath for removing moved files
authorMads Kiilerich <mads@kiilerich.com>
Tue, 15 Jan 2013 01:05:12 +0100
changeset 18333 f6f23ecafc9b
parent 18332 6ba58ab719e5
child 18334 44bda93df90e
merge: use util.unlinkpath for removing moved files - more like how removed files are removed.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Tue Jan 15 01:05:12 2013 +0100
+++ b/mercurial/merge.py	Tue Jan 15 01:05:12 2013 +0100
@@ -367,7 +367,7 @@
         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):
Mercurial