← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-18 17:24:52 UTC
  • mfrom: (6468.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120218172452-x7mk642v7mwxtyo1
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
2658
2658
        self.test_home_dir = self.test_dir + "/MemoryTransportMissingHomeDir"
2659
2659
        self.permit_dir(self.test_dir)
2660
2660
 
2661
 
    def make_branch(self, relpath, format=None):
 
2661
    def make_branch(self, relpath, format=None, name=None):
2662
2662
        """Create a branch on the transport at relpath."""
2663
2663
        repo = self.make_repository(relpath, format=format)
2664
 
        return repo.bzrdir.create_branch(append_revisions_only=False)
 
2664
        return repo.bzrdir.create_branch(append_revisions_only=False,
 
2665
                                         name=name)
2665
2666
 
2666
2667
    def get_default_format(self):
2667
2668
        return 'default'