← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-18 21:07:10 UTC
  • mfrom: (2490.2.27 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
Better merge base selection and graph API

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
 
            from bzrlib.revision import common_ancestor
2089
 
            try:
2090
 
                base_rev_id = common_ancestor(self.branch.last_revision(),
2091
 
                                              old_tip,
2092
 
                                              self.branch.repository)
2093
 
            except errors.NoCommonAncestor:
2094
 
                base_rev_id = None
 
2088
            graph = self.branch.repository.get_graph()
 
2089
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2090
                                                old_tip)
2095
2091
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2096
2092
            other_tree = self.branch.repository.revision_tree(old_tip)
2097
2093
            result += merge.merge_inner(