--- a/mercurial/scmutil.py Tue Apr 02 17:19:36 2013 -0700
+++ b/mercurial/scmutil.py Wed Apr 03 15:32:15 2013 -0700
@@ -703,7 +703,7 @@
status = _('removing %s\n') % ((pats and rel) or abs)
repo.ui.status(status)
- copies = {}
+ renames = {}
if similarity > 0:
for old, new, score in similar.findrenames(repo,
added + unknown, removed + deleted, similarity):
@@ -711,7 +711,7 @@
repo.ui.status(_('recording removal of %s as rename to %s '
'(%d%% similar)\n') %
(m.rel(old), m.rel(new), score * 100))
- copies[new] = old
+ renames[new] = old
if not dry_run:
wctx = repo[None]
@@ -719,7 +719,7 @@
try:
wctx.forget(deleted)
wctx.add(unknown)
- for new, old in copies.iteritems():
+ for new, old in renames.iteritems():
wctx.copy(old, new)
finally:
wlock.release()