← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
258
258
                pb = ui.ui_factory.nested_progress_bar()
259
259
                try:
260
260
                    this_repo = self.this_branch.repository
261
 
                    walker = this_repo.get_graph_walker()
 
261
                    graph = this_repo.get_graph()
262
262
                    revisions = [ensure_null(self.this_basis),
263
263
                                 ensure_null(self.other_basis)]
264
264
                    if NULL_REVISION in revisions:
265
265
                        self.base_rev_id = NULL_REVISION
266
266
                    else:
267
 
                        self.base_rev_id = walker.find_unique_lca(*revisions)
 
267
                        self.base_rev_id = graph.find_unique_lca(*revisions)
268
268
                        if self.base_rev_id == NULL_REVISION:
269
269
                            raise UnrelatedBranches()
270
270
                finally: