← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-11-24 16:01:57 UTC
  • mfrom: (4597.13.7 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5558.
  • Revision ID: v.ladeuil+lp@free.fr-20101124160157-kieuslo7wj9abdmb
Merge cleanup into 638451-malformed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
137
137
            # -- vila 20090311
138
138
            chk_tree_format = WorkingTreeFormat4()
139
139
            chk_tree_format._get_matchingbzrdir = \
140
 
                lambda:bzrlib.bzrdir.format_registry.make_bzrdir(
141
 
                    'development6-rich-root')
 
140
                lambda:bzrlib.bzrdir.format_registry.make_bzrdir('2a')
142
141
            test_intertree_permutations.append(
143
142
                (InterTree.__name__ + "(CHKInventory)",
144
143
                 InterTree,