/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-20 14:25:06 UTC
  • mfrom: (2540 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070620142506-txsb1v8538kpsafw
merge bzr.dev @ 2540

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
813
813
                to_revision = osutils.safe_revision_id(to_revision)
814
814
            merger.other_rev_id = to_revision
815
815
            if merger.other_rev_id is None:
816
 
                raise error.NoCommits(branch)
 
816
                raise errors.NoCommits(branch)
817
817
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
818
818
            merger.other_basis = merger.other_rev_id
819
819
            merger.other_tree = self.branch.repository.revision_tree(
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(