Mercurial > hg-stable
changeset 18333:f6f23ecafc9b
merge: use util.unlinkpath for removing moved files
- more like how removed files are removed.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Jan 2013 01:05:12 +0100 |
| parents | 6ba58ab719e5 |
| children | 44bda93df90e |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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):