« back to all changes in this revision
Viewing changes to bzrlib/selftest/commit_merge.py
- Committer: John Arbash Meinel
- Date: 2005-11-18 16:16:38 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-20051118161638-f3cc5fcfb6504126
Renamed all test modules to remove the 'test' prefix
- files renamed:
- bzrlib/selftest/test_ancestry.py => bzrlib/selftest/ancestry.py
- bzrlib/selftest/testannotate.py => bzrlib/selftest/annotate.py
- bzrlib/selftest/testapi.py => bzrlib/selftest/api.py
- bzrlib/selftest/test_bad_files.py => bzrlib/selftest/bad_files.py
- bzrlib/selftest/testbranch.py => bzrlib/selftest/branch.py
- bzrlib/selftest/test_command.py => bzrlib/selftest/command.py
- bzrlib/selftest/test_commit.py => bzrlib/selftest/commit.py
- bzrlib/selftest/test_commit_merge.py => bzrlib/selftest/commit_merge.py
- bzrlib/selftest/testconfig.py => bzrlib/selftest/config.py
- bzrlib/selftest/test_conflicts.py => bzrlib/selftest/conflicts.py
- bzrlib/selftest/testdiff.py => bzrlib/selftest/diff.py
- bzrlib/selftest/testfetch.py => bzrlib/selftest/fetch.py
- bzrlib/selftest/testgpg.py => bzrlib/selftest/gpg.py
- bzrlib/selftest/testgraph.py => bzrlib/selftest/graph.py
- bzrlib/selftest/testhashcache.py => bzrlib/selftest/hashcache.py
- bzrlib/selftest/testhttp.py => bzrlib/selftest/http.py
- bzrlib/selftest/testidentitymap.py => bzrlib/selftest/identitymap.py
- bzrlib/selftest/testinv.py => bzrlib/selftest/inv.py
- bzrlib/selftest/testlog.py => bzrlib/selftest/log.py
- bzrlib/selftest/testmerge.py => bzrlib/selftest/merge.py
- bzrlib/selftest/testmerge3.py => bzrlib/selftest/merge3.py
- bzrlib/selftest/test_merge_core.py => bzrlib/selftest/merge_core.py
- bzrlib/selftest/testnonascii.py => bzrlib/selftest/nonascii.py
- bzrlib/selftest/testoptions.py => bzrlib/selftest/options.py
- bzrlib/selftest/test_parent.py => bzrlib/selftest/parent.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- bzrlib/selftest/testrevision.py => bzrlib/selftest/revision.py
- bzrlib/selftest/test_revision_info.py => bzrlib/selftest/revision_info.py
- bzrlib/selftest/testrevisionnamespaces.py => bzrlib/selftest/revisionnamespaces.py
- bzrlib/selftest/testrevprops.py => bzrlib/selftest/revprops.py
- bzrlib/selftest/testreweave.py => bzrlib/selftest/reweave.py
- bzrlib/selftest/testsampler.py => bzrlib/selftest/sampler.py
- bzrlib/selftest/testsftp.py => bzrlib/selftest/sftp.py
- bzrlib/selftest/test_smart_add.py => bzrlib/selftest/smart_add.py
- bzrlib/selftest/teststatus.py => bzrlib/selftest/status.py
- bzrlib/selftest/teststore.py => bzrlib/selftest/store.py
- bzrlib/selftest/testtestament.py => bzrlib/selftest/testament.py
- bzrlib/selftest/testtrace.py => bzrlib/selftest/trace.py
- bzrlib/selftest/testtransactions.py => bzrlib/selftest/transactions.py
- bzrlib/selftest/testtransport.py => bzrlib/selftest/transport.py
- bzrlib/selftest/testtsort.py => bzrlib/selftest/tsort.py
- bzrlib/selftest/test_upgrade.py => bzrlib/selftest/upgrade.py
- bzrlib/selftest/test_weave.py => bzrlib/selftest/weave.py
- bzrlib/selftest/testworkingtree.py => bzrlib/selftest/workingtree.py
- bzrlib/selftest/test_xml.py => bzrlib/selftest/xml.py
- files modified:
- bzrlib/selftest/__init__.py
added
removed
bzrlib/selftest/commit_merge.py
