← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v09.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-06-08 05:00:01 UTC
  • mto: (4441.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 4443.
  • Revision ID: nmb@wartburg.edu-20090608050001-7znk3433urf3bf0p
Fix 269477 Add documentation about diverged branches and refer to it when pushing fails

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v09.py
63
63
        testament = StrictTestament3.from_revision(repository, revision_id)
64
64
        return testament.as_sha1()
65
65
 
66
 
    def _testament_sha1(self, revision, tree):
67
 
        return StrictTestament3(revision, tree).as_sha1()
 
66
    def _testament_sha1(self, revision, inventory):
 
67
        return StrictTestament3(revision, inventory).as_sha1()
68
68
 
69
69
 
70
70
class BundleReaderV09(BundleReader):