← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-06-08 21:48:42 UTC
  • mto: This revision was merged to the branch mainline in revision 2534.
  • Revision ID: abentley@panoramicfeedback.com-20070608214842-t47flt7htr2xz0yh
Rename graph to deprecated_graph

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2561
2561
        last1 = branch1.last_revision()
2562
2562
        last2 = branch2.last_revision()
2563
2563
 
2564
 
        walker = branch1.repository.get_graph_walker(branch2.repository)
2565
 
        base_rev_id = walker.find_unique_lca(last1, last2)
 
2564
        graph = branch1.repository.get_graph(branch2.repository)
 
2565
        base_rev_id = graph.find_unique_lca(last1, last2)
2566
2566
 
2567
2567
        print 'merge base is revision %s' % base_rev_id
2568
2568
 
2806
2806
                                             " merges.  Not cherrypicking or"
2807
2807
                                             " multi-merges.")
2808
2808
            repository = tree.branch.repository
2809
 
            walker = repository.get_graph_walker()
2810
 
            base_revision = walker.find_unique_lca(parents[0], parents[1])
 
2809
            graph = repository.get_graph()
 
2810
            base_revision = graph.find_unique_lca(parents[0], parents[1])
2811
2811
            base_tree = repository.revision_tree(base_revision)
2812
2812
            other_tree = repository.revision_tree(parents[1])
2813
2813
            interesting_ids = None