← 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-28 14:47:49 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070628144749-sifruimxo2qfwnbw
Implement cherrypick support for merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
245
245
        self.other_tree = self.revision_tree(revision_id)
246
246
        self.other_basis = revision_id
247
247
 
 
248
    def set_base_revision(self, revision_id, branch):
 
249
        """Set 'base' based on a branch and revision id
 
250
 
 
251
        :param revision_id: The revision to use for a tree
 
252
        :param branch: The branch containing this tree
 
253
        """
 
254
        self.base_rev_id = revision_id
 
255
        self.base_branch = branch
 
256
        self.this_branch.fetch(branch, revision_id)
 
257
        self.base_tree = self.revision_tree(revision_id)
 
258
        self.base_is_ancestor = is_ancestor(self.this_basis,
 
259
                                            self.base_rev_id,
 
260
                                            self.this_branch)
 
261
 
248
262
    def find_base(self):
249
263
        self.set_base([None, None])
250
264