← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_repository.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_repository.py
343
343
            # This gives metadir branches something they can convert to.
344
344
            # it would be nice to have a 'latest' vs 'default' concept.
345
345
            format = controldir.format_registry.make_bzrdir(
346
 
                'development-subtree')
 
346
                'dirstate-with-subtree')
347
347
            upgrade.upgrade(repo.bzrdir.root_transport.base, format=format)
348
348
        except errors.UpToDateFormat:
349
349
            # this is in the most current format already.
628
628
            self.get_vfs_only_url('remote')).open_repository()
629
629
        # Make a branch in that repo in an old format that isn't the default
630
630
        # branch format for the repo.
631
 
        from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
 
631
        from bzrlib.branch import BzrBranchFormat5
632
632
        format = remote_backing_repo.bzrdir.cloning_metadir()
633
633
        format._branch_format = BzrBranchFormat5()
634
634
        remote_transport = remote_repo.bzrdir.root_transport.clone('branch')