← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_reference/test_get_record_stream.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_reference/test_get_record_stream.py
82
82
        self.all_repo.lock_read()
83
83
        self.addCleanup(self.all_repo.unlock)
84
84
        self.base_repo = self.make_repository('base')
85
 
        self.stacked_repo = self.make_referring('referring', 'base')
 
85
        self.stacked_repo = self.make_referring('referring', self.base_repo)
86
86
 
87
87
    def make_simple_split(self):
88
88
        """Set up the repositories so that everything is in base except F"""