← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_vf/test_check_reconcile.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_vf/test_check_reconcile.py
461
461
 
462
462
        # make rev1b: A well-formed revision, containing 'a-file'
463
463
        # rev1b of a-file has the exact same contents as rev1a.
464
 
        file_contents = repo.texts.get_record_stream([('a-file-id', 'rev1a')],
465
 
            "unordered", False).next().get_bytes_as('fulltext')
 
464
        file_contents = repo.revision_tree('rev1a').get_file_text('a-file-id')
466
465
        inv = self.make_one_file_inventory(
467
466
            repo, 'rev1b', [], root_revision='rev1b',
468
467
            file_contents=file_contents)
823
822
        revision = Revision(revision_id, committer='jrandom@example.com',
824
823
            timestamp=0, inventory_sha1='', timezone=0, message='foo',
825
824
            parent_ids=parent_ids)
826
 
        repo.add_revision(revision_id, revision, inv)
 
825
        repo.add_revision(revision_id,revision, inv)
827
826
 
828
827
    def make_one_file_inventory(self, repo, revision, parents,
829
828
                                inv_revision=None, root_revision=None,