Mercurial > evolve

changeset 1212:2c1b6e2ec59a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 13 Mar 2015 10:49:02 -0700
parents 46a465fb2aee (diff) 9523c027a240 (current diff)
children 7118996bdf43
files hgext/evolve.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Fri Mar 13 09:05:34 2015 -0700
+++ b/hgext/evolve.py	Fri Mar 13 10:49:02 2015 -0700
@@ -1422,7 +1422,10 @@
         files = set()
         copied = copies.pathcopies(prec, bumped)
         precmanifest = prec.manifest()
-        for key, val in bumped.manifest().iteritems():
+        # 3.3.2 needs a list.
+        # future 3.4 don't detect the size change during iteration
+        # this is fishy
+        for key, val in list(bumped.manifest().iteritems()):
             precvalue = precmanifest.get(key, None)
             if precvalue is not None:
                 del precmanifest[key]