← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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.revision_tree('rev1a').get_file_text('a-file-id')
 
464
        file_contents = repo.texts.get_record_stream([('a-file-id', 'rev1a')],
 
465
            "unordered", False).next().get_bytes_as('fulltext')
465
466
        inv = self.make_one_file_inventory(
466
467
            repo, 'rev1b', [], root_revision='rev1b',
467
468
            file_contents=file_contents)
822
823
        revision = Revision(revision_id, committer='jrandom@example.com',
823
824
            timestamp=0, inventory_sha1='', timezone=0, message='foo',
824
825
            parent_ids=parent_ids)
825
 
        repo.add_revision(revision_id,revision, inv)
 
826
        repo.add_revision(revision_id, revision, inv)
826
827
 
827
828
    def make_one_file_inventory(self, repo, revision, parents,
828
829
                                inv_revision=None, root_revision=None,