/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/weave.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/weave.py
990
990
    # map from version name -> all parent names
991
991
    combined_parents = _reweave_parent_graphs(wa, wb)
992
992
    mutter("combined parents: %r", combined_parents)
993
 
    order = tsort.topo_sort(combined_parents.iteritems())
 
993
    order = tsort.topo_sort(combined_parents.items())
994
994
    mutter("order to reweave: %r", order)
995
995
 
996
996
    if pb and not msg: