← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 14:57:58 UTC
  • mto: (5757.7.2 knitpackrepo-6)
  • mto: This revision was merged to the branch mainline in revision 5771.
  • Revision ID: jelmer@samba.org-20110405145758-xo5i89sbot1r49ug
Add bzrlib.repofmt.knitpack_repo to the blacklist in test_import_tariff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
42
42
        urlutils,
43
43
        )
44
44
from bzrlib.config import BranchConfig, TransportConfig
45
 
from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack5RichRoot
46
45
from bzrlib.tag import (
47
46
    BasicTags,
48
47
    DisabledTags,
2148
2147
                      ]
2149
2148
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2150
2149
 
2151
 
    def __init__(self):
2152
 
        super(BzrBranchFormat8, self).__init__()
2153
 
        self._matchingbzrdir.repository_format = \
2154
 
            RepositoryFormatKnitPack5RichRoot()
2155
 
 
2156
2150
    def make_tags(self, branch):
2157
2151
        """See bzrlib.branch.BranchFormat.make_tags()."""
2158
2152
        return BasicTags(branch)
2200
2194
    def supports_stacking(self):
2201
2195
        return True
2202
2196
 
 
2197
    def make_tags(self, branch):
 
2198
        """See bzrlib.branch.BranchFormat.make_tags()."""
 
2199
        return BasicTags(branch)
 
2200
 
2203
2201
    supports_reference_locations = False
2204
2202
 
2205
2203