← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_exceptions.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-04 08:49:15 UTC
  • mfrom: (5818 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5819.
  • Revision ID: jelmer@samba.org-20110504084915-05bjgkllosui58o9
Merge bzr.dev, resolve conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_exceptions.py
102
102
        bzrdir.register_metadir(controldir.format_registry, "testobsolete",
103
103
            "bzrlib.tests.blackbox.test_exceptions.TestObsoleteRepoFormat",
104
104
            branch_format='bzrlib.branch.BzrBranchFormat7',
105
 
            tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
105
            tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
106
106
            deprecated=True,
107
107
            help='Same as 2a, but with an obsolete repo format.')
108
108
        self.disable_deprecation_warning()