← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

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