/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2009-12-07 21:46:28 UTC
  • mfrom: (4871 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4873.
  • Revision ID: aaron@aaronbentley.com-20091207214628-yifwgux0fn4x3bo4
Merge bzr.dev into merge-i-lock.

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,