← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
67
67
 
68
68
    def get_branch(self):
69
69
        if self.branch is None:
70
 
            self.branch = self.make_branch('')
 
70
            self.branch = self.make_branch('abranch')
71
71
        return self.branch
72
72
 
73
73
    def make_branch(self, relpath, format=None):
77
77
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
78
78
        # Skipped is the wrong exception to raise.
79
79
        try:
80
 
            return self.branch_format.initialize(repo.bzrdir)
 
80
            branch = self.branch_format.initialize(repo.bzrdir)
81
81
        except errors.UninitializableFormat:
82
82
            raise tests.TestSkipped('Uninitializable branch format')
 
83
        if (branch._format.supports_set_append_revisions_only() and
 
84
            branch.get_append_revisions_only()):
 
85
            branch.set_append_revisions_only(False)
 
86
        return branch
83
87
 
84
88
    def make_branch_builder(self, relpath, format=None):
85
89
        if format is None: