/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/merge.py

  • Committer: Robert Collins
  • Date: 2007-07-20 02:27:13 UTC
  • mfrom: (2634 +trunk)
  • mto: (2592.3.48 repository)
  • mto: This revision was merged to the branch mainline in revision 2682.
  • Revision ID: robertc@robertcollins.net-20070720022713-z6x6cns4dy1mzhpk
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
224
224
        self.other_tree = self.revision_tree(revision_id)
225
225
        self.other_basis = revision_id
226
226
 
 
227
    def set_base_revision(self, revision_id, branch):
 
228
        """Set 'base' based on a branch and revision id
 
229
 
 
230
        :param revision_id: The revision to use for a tree
 
231
        :param branch: The branch containing this tree
 
232
        """
 
233
        self.base_rev_id = revision_id
 
234
        self.base_branch = branch
 
235
        self._maybe_fetch(branch, self.this_branch, revision_id)
 
236
        self.base_tree = self.revision_tree(revision_id)
 
237
        self.base_is_ancestor = is_ancestor(self.this_basis,
 
238
                                            self.base_rev_id,
 
239
                                            self.this_branch)
 
240
        self.base_is_other_ancestor = is_ancestor(self.other_basis,
 
241
                                                  self.base_rev_id,
 
242
                                                  self.this_branch)
 
243
 
227
244
    def _maybe_fetch(self, source, target, revision_id):
228
245
        if (source.repository.bzrdir.root_transport.base !=
229
246
            target.repository.bzrdir.root_transport.base):