← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Aaron Bentley
  • Date: 2007-06-28 14:14:16 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070628141416-lf6u1noi6gk5lf1g
start work on directive cherry-picking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
462
462
        apply_bundle.install_bundle(target_repo, self)
463
463
        return self.target
464
464
 
 
465
    def get_merge_request(self, target_repo):
 
466
        """Provide data for performing a merge
 
467
 
 
468
        Returns suggested base, suggested target, and patch verification status
 
469
        """
 
470
        return None, self.target, 'inapplicable'
 
471
 
465
472
 
466
473
class BundleTree(Tree):
467
474
    def __init__(self, base_tree, revision_id):