← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-09 22:57:21 UTC
  • mfrom: (1551.12.48 mergedirective)
  • Revision ID: pqm@pqm.ubuntu.com-20070309225721-d395866527ca9a47
Add support for merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
56
56
    )
57
57
import bzrlib.branch
58
58
import bzrlib.commands
59
 
import bzrlib.bundle.serializer
 
59
import bzrlib.timestamp
60
60
import bzrlib.export
61
61
import bzrlib.inventory
62
62
import bzrlib.iterablefile
93
93
 
94
94
MODULES_TO_TEST = []
95
95
MODULES_TO_DOCTEST = [
96
 
                      bzrlib.bundle.serializer,
 
96
                      bzrlib.timestamp,
97
97
                      bzrlib.errors,
98
98
                      bzrlib.export,
99
99
                      bzrlib.inventory,
1955
1955
                   'bzrlib.tests.test_merge',
1956
1956
                   'bzrlib.tests.test_merge3',
1957
1957
                   'bzrlib.tests.test_merge_core',
 
1958
                   'bzrlib.tests.test_merge_directive',
1958
1959
                   'bzrlib.tests.test_missing',
1959
1960
                   'bzrlib.tests.test_msgeditor',
1960
1961
                   'bzrlib.tests.test_nonascii',
1990
1991
                   'bzrlib.tests.test_testament',
1991
1992
                   'bzrlib.tests.test_textfile',
1992
1993
                   'bzrlib.tests.test_textmerge',
 
1994
                   'bzrlib.tests.test_timestamp',
1993
1995
                   'bzrlib.tests.test_trace',
1994
1996
                   'bzrlib.tests.test_transactions',
1995
1997
                   'bzrlib.tests.test_transform',