← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Martin Pool
  • Date: 2005-07-05 07:19:12 UTC
  • Revision ID: mbp@sourcefrog.net-20050705071911-6a116ea7c5379658
- Renamed merge3 test suite for easier access.

- New merge approach based on finding triple-matching regions, and comparing
  the regions between them; add find_sync_regions() and some tests for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
214
214
    import bzrlib.selftest.whitebox
215
215
    import bzrlib.selftest.blackbox
216
216
    import bzrlib.selftest.versioning
217
 
    import bzrlib.selftest.merge3
 
217
    import bzrlib.selftest.testmerge3
218
218
    import bzrlib.merge_core
219
219
    from doctest import DocTestSuite
220
220
    import os
237
237
 
238
238
    for m in bzrlib.selftest.whitebox, \
239
239
            bzrlib.selftest.versioning, \
240
 
            bzrlib.selftest.merge3:
 
240
            bzrlib.selftest.testmerge3:
241
241
        suite.addTest(tl.loadTestsFromModule(m))
242
242
 
243
243
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \