/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/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2007-12-18 19:04:38 UTC
  • mfrom: (3123.1.3 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 3126.
  • Revision ID: john@arbash-meinel.com-20071218190438-sq0itdz00lu5cm5h
Merge in bzr.dev and the one_one deprecation string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
97
97
                          )
98
98
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
99
99
from bzrlib.tests.treeshape import build_tree_contents
 
100
import bzrlib.version_info_formats.format_custom
100
101
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2
101
102
 
102
103
# Mark this python module as being part of the implementation
117
118
        bzrlib.merge3,
118
119
        bzrlib.option,
119
120
        bzrlib.store,
 
121
        bzrlib.version_info_formats.format_custom,
120
122
        # quoted to avoid module-loading circularity
121
123
        'bzrlib.tests',
122
124
        ]