← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-20 14:25:06 UTC
  • mfrom: (2540 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070620142506-txsb1v8538kpsafw
merge bzr.dev @ 2540

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
634
634
                raise errors.NoCommits(b)
635
635
        revision_source = revision.MultipleRevisionSources(
636
636
                branch.repository, other_branch.repository)
637
 
        rev_id = revision.common_ancestor(revision_a, revision_b,
638
 
                                          revision_source)
 
637
        graph = branch.repository.get_graph(other_branch.repository)
 
638
        revision_a = revision.ensure_null(revision_a)
 
639
        revision_b = revision.ensure_null(revision_b)
 
640
        if revision.NULL_REVISION in (revision_a, revision_b):
 
641
            rev_id = revision.NULL_REVISION
 
642
        else:
 
643
            rev_id = graph.find_unique_lca(revision_a, revision_b)
 
644
            if rev_id == revision.NULL_REVISION:
 
645
                raise errors.NoCommonAncestor(revision_a, revision_b)
639
646
        try:
640
647
            revno = branch.revision_id_to_revno(rev_id)
641
648
        except errors.NoSuchRevision: