changeset 43106 | d783f945a701 |
parent 43077 | 687b865b95ad |
child 43117 | 8ff1ecfadcd1 |
--- a/mercurial/obsutil.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/obsutil.py Mon Oct 07 00:04:04 2019 -0400 @@ -15,6 +15,7 @@ encoding, node as nodemod, phases, + pycompat, util, ) from .utils import dateutil @@ -983,7 +984,7 @@ base[tuple(nsuccset)] = n return [ {b'divergentnodes': divset, b'commonpredecessor': b} - for divset, b in base.iteritems() + for divset, b in pycompat.iteritems(base) ]