merge with stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 13 Mar 2015 10:49:02 -0700
changeset 1212 2c1b6e2ec59a
parent 1208 46a465fb2aee (diff)
parent 1211 9523c027a240 (current diff)
child 1213 7118996bdf43
merge with stable
hgext/evolve.py
--- 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]