← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-04 11:38:49 UTC
  • mfrom: (6184 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6185.
  • Revision ID: v.ladeuil+lp@free.fr-20111004113849-9os4pc4swnvdklxk
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/__init__.py
159
159
        if self.extra_setup:
160
160
            self.extra_setup(self)
161
161
 
 
162
    def get_default_format(self):
 
163
        self.assertEquals(
 
164
            self.repository_format._matchingbzrdir.repository_format,
 
165
            self.repository_format)
 
166
        return self.repository_format._matchingbzrdir
 
167
 
162
168
    def make_branch(self, relpath, format=None):
163
169
        repo = self.make_repository(relpath, format=format)
164
170
        return repo.bzrdir.create_branch()