← 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: Andrew Bennetts
  • Date: 2009-12-03 05:57:41 UTC
  • mfrom: (4857 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4869.
  • Revision ID: andrew.bennetts@canonical.com-20091203055741-vmmg0fmjgjw2pwvu
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
163
163
                 optimiser._matching_from_tree_format,
164
164
                 optimiser._matching_to_tree_format,
165
165
                 optimiser.make_source_parent_tree_python_dirstate))
166
 
        else:
 
166
        elif (optimiser._matching_from_tree_format is not None and 
 
167
              optimiser._matching_to_tree_format is not None):
167
168
            test_intertree_permutations.append(
168
169
                (optimiser.__name__,
169
170
                 optimiser,