diff -r d65671beee7f -r d702a702259f hgext/convert/gnuarch.py --- a/hgext/convert/gnuarch.py Mon Jan 05 12:31:00 2009 +0100 +++ b/hgext/convert/gnuarch.py Mon Jan 05 14:37:46 2009 +0100 @@ -159,17 +159,16 @@ to = self.changes[rev].ren_files[src] changes.append((src, rev)) changes.append((to, rev)) - copies[src] = to + copies[to] = src for src in self.changes[rev].ren_dirs: to = self.changes[rev].ren_dirs[src] chgs, cps = self._rendirchanges(src, to); changes += [(f, rev) for f in chgs] - for c in cps: - copies[c] = cps[c] + copies.update(cps) self.lastrev = rev - return util.sort(changes), copies + return util.sort(util.unique(changes)), copies def getcommit(self, rev): changes = self.changes[rev] @@ -244,7 +243,7 @@ d = os.path.join(dest, f) changes.append(s) changes.append(d) - copies[s] = d + copies[d] = s return changes, copies def _obtainrevision(self, rev):