« back to all changes in this revision
Viewing changes to bzrlib/tests/blackbox/test_too_much.py
- Committer: Tim Penhey
- Date: 2008-04-20 08:48:04 UTC
- mfrom: (3374 +trunk)
- mto: (3473.1.1 ianc-integration)
- mto: This revision was merged to the branch mainline in revision 3474.
- Revision ID: tim@penhey.net-20080420084804-fw6m8ezw4n7pnmo1
Merge trunk.
- files added:
- bzrlib/bisect_multi.py
- bzrlib/help_topics
- bzrlib/help_topics/en
- doc/en/admin-guide
- doc/en/tutorials
- doc/en/user-guide/images
- files removed:
- bzrlib/plugins/multiparent.py
- files renamed:
- bzrlib/help_topics.py => bzrlib/help_topics/__init__.py
- doc/en/user-guide/configuration.txt => bzrlib/help_topics/en/configuration.txt
- doc/en/user-guide/conflicts.txt => bzrlib/help_topics/en/conflicts.txt
- doc/en/user-reference/hooks.txt => bzrlib/help_topics/en/hooks.txt
- bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py
- bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py
- bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py
- bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py
- bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py
- bzrlib/xml5.py => bzrlib/xml8.py
- doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt
- doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt
- files modified:
- .bzrignore
added
removed
bzrlib/tests/blackbox/test_too_much.py
