~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 22:43:26 UTC
  • mfrom: (4617.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090817224326-uhljmr5me5x3xyda
(robertc) Multiple 2a-as-default fixes. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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: