Viewing all changes in revision 4634.85.12.
- Committer: Andrew Bennetts
- Date: 2009-10-15 02:11:18 UTC
- mfrom: (4744 +trunk)
- mto: (4744.3.1 robust-cleanup-in-commit)
- mto: This revision was merged to the branch mainline in revision 4775.
- Revision ID: andrew.bennetts@canonical.com-20091015021118-2tlgbu01py4837zr
Merge lp:bzr.
- files added:
- bzrlib/_annotator_py.py
- bzrlib/filters
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/tests/commands
- bzrlib/tests/ftp_server
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_inventory
- bzrlib/tests/per_repository_chk
- bzrlib/tests/per_repository_reference
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- bzrlib/util/tests
- doc/developers
- doc/developers/_static
- doc/developers/_templates
- doc/en
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/admin-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/upgrade-guide
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- doc/es
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/es/mini-tutorial
- doc/es/quick-reference
- doc/es/user-guide
- doc/ru
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- doc/ru/mini-tutorial
- doc/ru/quick-reference
- doc/ru/tutorials
- doc/ru/user-guide
- doc/ru/user-guide/images
- tools/packaging
- tools/win32/buildout-templates
- tools/win32/buildout-templates/bin
- files removed:
- build-api
- bzrlib/bundle/old
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/util/configobj/docs
- files renamed:
- bzrlib/patiencediff.py => bzrlib/_patiencediff_py.py
- bzrlib/graph.py => bzrlib/deprecated_graph.py
- tools/doc_generate/ => bzrlib/doc_generate/
- bzrlib/help_topics.py => bzrlib/help_topics/__init__.py
- doc/configuration.txt => bzrlib/help_topics/en/configuration.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/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_send.py
- bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py
- bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py
- bzrlib/tests/branch_implementations/ => bzrlib/tests/per_branch/
- bzrlib/tests/bzrdir_implementations/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/interrepository_implementations/ => bzrlib/tests/per_interrepository/
- bzrlib/tests/intertree_implementations/ => bzrlib/tests/per_intertree/
- bzrlib/tests/repository_implementations/ => bzrlib/tests/per_repository/
- bzrlib/tests/test_transport_implementations.py => bzrlib/tests/per_transport.py
- bzrlib/tests/tree_implementations/ => bzrlib/tests/per_tree/
- bzrlib/tests/test_versionedfile.py => bzrlib/tests/per_versionedfile.py
- bzrlib/tests/workingtree_implementations/ => bzrlib/tests/per_workingtree/
- bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py
- bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py
- bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py
- bzrlib/util/bencode.py => bzrlib/util/_bencode_py.py
- bzrlib/xml5.py => bzrlib/xml8.py
- HACKING => doc/developers/HACKING.txt
- doc/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt
- doc/tutorial.txt => doc/en/tutorials/tutorial.txt
- doc/http_smart_server.txt => doc/en/user-guide/http_smart_server.txt
- doc/plugins.txt => doc/en/user-guide/plugins.txt
- doc/server.txt => doc/en/user-guide/server.txt
- doc/setting_up_email.txt => doc/en/user-guide/setting_up_email.txt
- doc/specifying_revisions.txt => doc/en/user-guide/specifying_revisions.txt
- doc/using_aliases.txt => doc/en/user-guide/using_aliases.txt
- doc/version_info.txt => doc/en/user-guide/version_info.txt
- generate_docs.py => tools/generate_docs.py
- files modified:
- .bzrignore
- setup.py *
expand all
collapse all
added
removed
doc/Bazaar-Logo-For-Manuals.png
doc/developers/_static/bzr icon 16.png
doc/en/_static/bzr icon 16.png
doc/en/_static/en/bzr-en-quick-reference.png
doc/en/_static/en/bzr-en-quick-reference.svg
doc/en/user-guide/images/workflows_centralized.png
doc/en/user-guide/images/workflows_centralized.svg
doc/en/user-guide/images/workflows_gatekeeper.png
doc/en/user-guide/images/workflows_gatekeeper.svg
doc/en/user-guide/images/workflows_localcommit.png
doc/en/user-guide/images/workflows_localcommit.svg
doc/en/user-guide/images/workflows_peer.png
doc/en/user-guide/images/workflows_peer.svg
doc/en/user-guide/images/workflows_pqm.png
doc/en/user-guide/images/workflows_pqm.svg
doc/en/user-guide/images/workflows_shared.png
doc/en/user-guide/images/workflows_shared.svg
doc/en/user-guide/images/workflows_single.png
doc/en/user-guide/images/workflows_single.svg
doc/es/_static/bzr icon 16.png
doc/es/_static/es/bzr-es-quick-reference.png
doc/es/_static/es/bzr-es-quick-reference.svg
doc/ru/_static/bzr icon 16.png
doc/ru/_static/ru/bzr-ru-quick-reference.png
doc/ru/_static/ru/bzr-ru-quick-reference.svg
doc/ru/user-guide/images/workflows_centralized.png
doc/ru/user-guide/images/workflows_centralized.svg
doc/ru/user-guide/images/workflows_gatekeeper.png
doc/ru/user-guide/images/workflows_gatekeeper.svg
doc/ru/user-guide/images/workflows_localcommit.png
doc/ru/user-guide/images/workflows_localcommit.svg
doc/ru/user-guide/images/workflows_peer.png
doc/ru/user-guide/images/workflows_peer.svg
doc/ru/user-guide/images/workflows_pqm.png
doc/ru/user-guide/images/workflows_pqm.svg
doc/ru/user-guide/images/workflows_shared.png
doc/ru/user-guide/images/workflows_shared.svg
doc/ru/user-guide/images/workflows_single.png
doc/ru/user-guide/images/workflows_single.svg
