/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/tests/per_branch/__init__.py

  • Committer: Aaron Bentley
  • Date: 2009-08-18 12:49:22 UTC
  • mfrom: (4624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4630.
  • Revision ID: aaron@aaronbentley.com-20090818124922-amjt054mh5wm0s30
Merge bzr.dev into shelve-lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
78
78
        return self.branch
79
79
 
80
80
    def make_branch(self, relpath, format=None):
81
 
        repo = self.make_repository(relpath, format=format)
 
81
        if format is not None:
 
82
            return TestCaseWithBzrDir.make_branch(self, relpath, format)
 
83
        repo = self.make_repository(relpath)
82
84
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
83
85
        # Skipped is the wrong exception to raise.
84
86
        try: