← 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: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/__init__.py
1
 
# Copyright (C) 2006, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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,