Mercurial > evolve
changeset 1228:72a3f8d307b2 stable
evolve: have a stable manifest content when solving bumped
We cannot really use iteritems here.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 01 Apr 2015 14:37:02 -0700 |
parents | 9523c027a240 |
children | 175cc89bbe4c |
files | hgext/evolve.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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]