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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-03 23:54:50 UTC
  • mto: (7027.4.10 python3-blackbox)
  • mto: This revision was merged to the branch mainline in revision 7029.
  • Revision ID: jelmer@jelmer.uk-20180703235450-p10v67yhkzsebucd
Port fastimport to python3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/branch.py
591
591
        # ancestry. Given the order guaranteed by the merge sort, we will see
592
592
        # uninteresting descendants of the first parent of our tip before the
593
593
        # tip itself.
594
 
        first = next(rev_iter)
 
594
        try:
 
595
            first = next(rev_iter)
 
596
        except StopIteration:
 
597
            return
595
598
        (rev_id, merge_depth, revno, end_of_merge) = first
596
599
        yield first
597
600
        if not merge_depth: