Mercurial > hg
comparison mercurial/merge.py @ 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 |
comparison
equal
deleted
inserted
replaced
| 18332:6ba58ab719e5 | 18333:f6f23ecafc9b |
|---|---|
| 365 # remove renamed files after safely stored | 365 # remove renamed files after safely stored |
| 366 for f in moves: | 366 for f in moves: |
| 367 if os.path.lexists(repo.wjoin(f)): | 367 if os.path.lexists(repo.wjoin(f)): |
| 368 repo.ui.debug("removing %s\n" % f) | 368 repo.ui.debug("removing %s\n" % f) |
| 369 audit(f) | 369 audit(f) |
| 370 os.unlink(repo.wjoin(f)) | 370 util.unlinkpath(repo.wjoin(f)) |
| 371 | 371 |
| 372 numupdates = len(actions) | 372 numupdates = len(actions) |
| 373 for i, a in enumerate(actions): | 373 for i, a in enumerate(actions): |
| 374 f, m = a[:2] | 374 f, m = a[:2] |
| 375 repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates, | 375 repo.ui.progress(_('updating'), i + 1, item=f, total=numupdates, |