# HG changeset patch # User Pierre-Yves David # Date 1427924222 25200 # Node ID 72a3f8d307b2cf8755a13d136c84866cadbead20 # Parent 9523c027a240fe4ed5d9bb1afdd9960f66c9ba0c evolve: have a stable manifest content when solving bumped We cannot really use iteritems here. diff -r 9523c027a240 -r 72a3f8d307b2 hgext/evolve.py --- a/hgext/evolve.py Fri Mar 13 09:05:34 2015 -0700 +++ b/hgext/evolve.py Wed Apr 01 14:37:02 2015 -0700 @@ -1422,7 +1422,7 @@ files = set() copied = copies.pathcopies(prec, bumped) precmanifest = prec.manifest() - for key, val in bumped.manifest().iteritems(): + for key, val in list(bumped.manifest().iteritems()): precvalue = precmanifest.get(key, None) if precvalue is not None: del precmanifest[key]