← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Aaron Bentley
  • Date: 2007-06-21 02:33:43 UTC
  • mfrom: (2530.1.1 get_ancestry_no_topo)
  • mto: This revision was merged to the branch mainline in revision 2542.
  • Revision ID: aaron.bentley@utoronto.ca-20070621023343-3f3oy8iszatpjcui
Merge of not-sorting-ancestry branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
258
258
                [revision_a, revision_b])
259
259
            # Shortcut the case where one of the tips is already included in
260
260
            # the other graphs ancestry.
261
 
            ancestry_a = graph.get_ancestry(revision_a)
 
261
            ancestry_a = graph.get_ancestry(revision_a, topo_sorted=False)
262
262
            if revision_b in ancestry_a:
263
263
                return revision_b
264
 
            ancestry_b = graph.get_ancestry(revision_b)
 
264
            ancestry_b = graph.get_ancestry(revision_b, topo_sorted=False)
265
265
            if revision_a in ancestry_b:
266
266
                return revision_a
267
267
            # convert to a NULL_REVISION based graph.