# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1426268942 25200
# Node ID 2c1b6e2ec59addcc8ee490adfdf684b5d44e3dc1
# Parent  46a465fb2aeed25138daed9e6b47faf464c20f2e# Parent  9523c027a240fe4ed5d9bb1afdd9960f66c9ba0c
merge with stable

diff -r 9523c027a240 -r 2c1b6e2ec59a 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]