← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.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/workingtree.py
2085
2085
            #       inventory and calls tree._write_inventory(). Ultimately we
2086
2086
            #       should be able to remove this extra flush.
2087
2087
            self.flush()
2088
 
            walker = self.branch.repository.get_graph_walker()
2089
 
            base_rev_id = walker.find_unique_lca(self.branch.last_revision(),
2090
 
                                                 old_tip)
 
2088
            graph = self.branch.repository.get_graph()
 
2089
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2090
                                                old_tip)
2091
2091
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2092
2092
            other_tree = self.branch.repository.revision_tree(old_tip)
2093
2093
            result += merge.merge_inner(