--- a/hgext/convert/filemap.py Mon Jul 09 17:51:46 2012 +0200
+++ b/hgext/convert/filemap.py Fri Jul 06 01:14:02 2012 -0300
@@ -348,12 +348,13 @@
# original filename in the rev part of the return value.
changes, copies = self.base.getchanges(rev)
newnames = {}
- files = []
+ files = {}
for f, r in changes:
newf = self.filemapper(f)
- if newf:
- files.append((newf, (f, r)))
+ if newf and (newf != f or newf not in files):
+ files[newf] = (f, r)
newnames[f] = newf
+ files = sorted(files.items())
ncopies = {}
for c in copies: