Mercurial > evolve
comparison hgext/evolve.py @ 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 | e886bc501796 |
comparison
equal
deleted
inserted
replaced
| 1211:9523c027a240 | 1228:72a3f8d307b2 |
|---|---|
| 1420 # Create the new commit context | 1420 # Create the new commit context |
| 1421 repo.ui.status(_('computing new diff\n')) | 1421 repo.ui.status(_('computing new diff\n')) |
| 1422 files = set() | 1422 files = set() |
| 1423 copied = copies.pathcopies(prec, bumped) | 1423 copied = copies.pathcopies(prec, bumped) |
| 1424 precmanifest = prec.manifest() | 1424 precmanifest = prec.manifest() |
| 1425 for key, val in bumped.manifest().iteritems(): | 1425 for key, val in list(bumped.manifest().iteritems()): |
| 1426 precvalue = precmanifest.get(key, None) | 1426 precvalue = precmanifest.get(key, None) |
| 1427 if precvalue is not None: | 1427 if precvalue is not None: |
| 1428 del precmanifest[key] | 1428 del precmanifest[key] |
| 1429 if precvalue != val: | 1429 if precvalue != val: |
| 1430 files.add(key) | 1430 files.add(key) |