← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v4.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/serializer/v4.py
300
300
        finally:
301
301
            repository.unlock()
302
302
 
 
303
    def get_merge_request(self, target_repo):
 
304
        """Provide data for performing a merge
 
305
 
 
306
        Returns suggested base, suggested target, and patch verification status
 
307
        """
 
308
        return None, self.target, 'inapplicable'
 
309
 
 
310
 
303
311
    def get_bundle_reader(self):
304
312
        self._fileobj.seek(0)
305
313
        return BundleReader(self._fileobj)