Mercurial > hg
changeset 18331:e68cec5e28b0
merge: remove redundant unlink after merge
The early prescan for move/remove and removal of moved files in applyupdates
was introduced with mergestate 368a4ec603cc and rendered this chunk of code
irrelevant.
The impact of the chunk was reduced in 5b3383ea67d2 - but it could have been
removed completely.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 09 Jan 2013 00:01:33 +0100 |
| parents | b717f49833a2 |
| children | 6ba58ab719e5 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Jan 09 00:01:33 2013 +0100 +++ b/mercurial/merge.py Wed Jan 09 00:01:33 2013 +0100 @@ -402,11 +402,6 @@ updated += 1 else: merged += 1 - if (move and repo.dirstate.normalize(fd) != f - and os.path.lexists(repo.wjoin(f))): - repo.ui.debug("removing %s\n" % f) - audit(f) - os.unlink(repo.wjoin(f)) elif m == "g": # get flags = a[2] repo.ui.note(_("getting %s\n") % f)