/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/bundle/serializer/v09.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

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, inventory):
67
 
        return StrictTestament3(revision, inventory).as_sha1()
 
66
    def _testament_sha1(self, revision, tree):
 
67
        return StrictTestament3(revision, tree).as_sha1()
68
68
 
69
69
 
70
70
class BundleReaderV09(BundleReader):