Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: have a stable manifest content when solving bumped stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Wed, 01 Apr 2015 14:37:02 -0700
branchstable
changeset 1228 72a3f8d307b2
parent 1211 9523c027a240
child 1229 175cc89bbe4c
evolve: have a stable manifest content when solving bumped We cannot really use iteritems here.
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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]
evolve