← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_known_graph_pyx.pyx

Merge the 2.0 branch, resolve one conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_known_graph_pyx.pyx
703
703
            self._revno_first, self._revno_second, self._revno_last,
704
704
            self.is_first_child, self.seen_by_child)
705
705
 
706
 
    cdef int has_pending_parents(self):
 
706
    cdef int has_pending_parents(self): # cannot_raise
707
707
        if self.left_pending_parent is not None or self.pending_parents:
708
708
            return 1
709
709
        return 0