« back to all changes in this revision
Viewing changes to bzrlib/tests/test_merge3.py
- Committer: John Arbash Meinel
- Date: 2005-11-23 15:44:24 UTC
- mto: (1185.50.19 bzr-jam-integration)
- mto: This revision was merged to the branch mainline in revision 1512.
- Revision ID: john@arbash-meinel.com-20051123154424-a02f8bf990a1fed5
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
- files renamed:
- bzrlib/selftest/ => bzrlib/tests/
- bzrlib/selftest/ancestry.py => bzrlib/tests/test_ancestry.py
- bzrlib/selftest/annotate.py => bzrlib/tests/test_annotate.py
- bzrlib/selftest/api.py => bzrlib/tests/test_api.py
- bzrlib/selftest/bad_files.py => bzrlib/tests/test_bad_files.py
- bzrlib/selftest/branch.py => bzrlib/tests/test_branch.py
- bzrlib/selftest/command.py => bzrlib/tests/test_command.py
- bzrlib/selftest/commit.py => bzrlib/tests/test_commit.py
- bzrlib/selftest/commit_merge.py => bzrlib/tests/test_commit_merge.py
- bzrlib/selftest/config.py => bzrlib/tests/test_config.py
- bzrlib/selftest/conflicts.py => bzrlib/tests/test_conflicts.py
- bzrlib/selftest/diff.py => bzrlib/tests/test_diff.py
- bzrlib/selftest/fetch.py => bzrlib/tests/test_fetch.py
- bzrlib/selftest/gpg.py => bzrlib/tests/test_gpg.py
- bzrlib/selftest/graph.py => bzrlib/tests/test_graph.py
- bzrlib/selftest/hashcache.py => bzrlib/tests/test_hashcache.py
- bzrlib/selftest/http.py => bzrlib/tests/test_http.py
- bzrlib/selftest/identitymap.py => bzrlib/tests/test_identitymap.py
- bzrlib/selftest/inv.py => bzrlib/tests/test_inv.py
- bzrlib/selftest/log.py => bzrlib/tests/test_log.py
- bzrlib/selftest/merge.py => bzrlib/tests/test_merge.py
- bzrlib/selftest/merge3.py => bzrlib/tests/test_merge3.py
- bzrlib/selftest/merge_core.py => bzrlib/tests/test_merge_core.py
- bzrlib/selftest/nonascii.py => bzrlib/tests/test_nonascii.py
- bzrlib/selftest/options.py => bzrlib/tests/test_options.py
- bzrlib/selftest/parent.py => bzrlib/tests/test_parent.py
- bzrlib/selftest/plugins.py => bzrlib/tests/test_plugins.py
- bzrlib/selftest/revision.py => bzrlib/tests/test_revision.py
- bzrlib/selftest/revision_info.py => bzrlib/tests/test_revision_info.py
- bzrlib/selftest/revisionnamespaces.py => bzrlib/tests/test_revisionnamespaces.py
- bzrlib/selftest/revprops.py => bzrlib/tests/test_revprops.py
- bzrlib/selftest/reweave.py => bzrlib/tests/test_reweave.py
- bzrlib/selftest/sampler.py => bzrlib/tests/test_sampler.py
- bzrlib/selftest/sftp.py => bzrlib/tests/test_sftp.py
- bzrlib/selftest/smart_add.py => bzrlib/tests/test_smart_add.py
- bzrlib/selftest/status.py => bzrlib/tests/test_status.py
- bzrlib/selftest/store.py => bzrlib/tests/test_store.py
- bzrlib/selftest/testament.py => bzrlib/tests/test_testament.py
- bzrlib/selftest/trace.py => bzrlib/tests/test_trace.py
- bzrlib/selftest/transactions.py => bzrlib/tests/test_transactions.py
- bzrlib/selftest/transport.py => bzrlib/tests/test_transport.py
- bzrlib/selftest/tsort.py => bzrlib/tests/test_tsort.py
- bzrlib/selftest/uncommit.py => bzrlib/tests/test_uncommit.py
- bzrlib/selftest/upgrade.py => bzrlib/tests/test_upgrade.py
- bzrlib/selftest/weave.py => bzrlib/tests/test_weave.py
- bzrlib/selftest/whitebox.py => bzrlib/tests/test_whitebox.py
- bzrlib/selftest/workingtree.py => bzrlib/tests/test_workingtree.py
- bzrlib/selftest/xml.py => bzrlib/tests/test_xml.py
- files modified:
- bzrlib/__init__.py
added
removed
bzrlib/tests/test_merge3.py
