/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/reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:08 UTC
  • mfrom: (6675 work)
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005208-dthx80fkolfpsenj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/reconcile.py
430
430
            # NB: This is really not needed, reconcile != pack.
431
431
            per_id_bad_parents[key[0]] = {}
432
432
        # Generate per-knit/weave data.
433
 
        for key, details in bad_parents.iteritems():
 
433
        for key, details in bad_parents.items():
434
434
            file_id = key[0]
435
435
            rev_id = key[1]
436
436
            knit_parents = tuple([parent[-1] for parent in details[0]])