Viewing all changes in revision 2621.3.2.
- Committer: Andrew Bennetts
- Date: 2007-08-02 06:40:58 UTC
- mfrom: (2666 +trunk)
- mto: This revision was merged to the branch mainline in revision 2668.
- Revision ID: andrew.bennetts@canonical.com-20070802064058-09eblz1qbc01fcr3
Merge bzr.dev.
- files added:
- bzrlib/file_names.py
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- files removed:
- bzrlib/_btree_serializer_c.pyx
- bzrlib/filters
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/tests/ftp_server
- bzrlib/tests/inventory_implementations
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_repository_reference
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- doc/en
- doc/en/admin-guide
- doc/en/developer-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- doc/es
- doc/es/guia-desarrollador
- doc/es/guia-usuario
- doc/es/mini-tutorial
- doc/es/notas-version
- doc/es/referencia
- doc/es/referencia-rapida
- tools/packaging
- files renamed:
- bzrlib/help_topics/__init__.py => bzrlib/help_topics.py
- bzrlib/_patiencediff_py.py => bzrlib/patiencediff.py
- bzrlib/plugins/launchpad/lp_directory.py => bzrlib/plugins/launchpad/lp_indirect.py
- bzrlib/plugins/launchpad/test_lp_directory.py => bzrlib/plugins/launchpad/test_lp_indirect.py
- bzrlib/tests/http_utils.py => bzrlib/tests/HTTPTestUtil.py
- bzrlib/tests/http_server.py => bzrlib/tests/HttpServer.py
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/tests/test_revisionspec.py => bzrlib/tests/test_revisionnamespaces.py
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/xml8.py => bzrlib/xml5.py
- doc/en/user-guide/bug_trackers.txt => doc/bug_trackers.txt
- doc/en/tutorials/centralized_workflow.txt => doc/centralized_workflow.txt
- bzrlib/help_topics/en/configuration.txt => doc/configuration.txt
- bzrlib/help_topics/en/conflicts.txt => doc/conflicts.txt
- doc/developers/HACKING.txt => doc/developers/HACKING
- doc/en/user-guide/http_smart_server.txt => doc/http_smart_server.txt
- doc/en/user-guide/index.txt => doc/index.txt
- doc/en/user-guide/plugins.txt => doc/plugins.txt
- doc/en/user-guide/server.txt => doc/server.txt
- doc/en/user-guide/setting_up_email.txt => doc/setting_up_email.txt
- doc/en/user-guide/shared_repository_layouts.txt => doc/shared_repository_layouts.txt
- doc/en/user-guide/specifying_revisions.txt => doc/specifying_revisions.txt
- doc/en/tutorials/tutorial.txt => doc/tutorial.txt
- doc/en/user-guide/using_aliases.txt => doc/using_aliases.txt
- doc/en/user-guide/version_info.txt => doc/version_info.txt
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/en/quick-reference/quick-start-summary.png
doc/en/quick-reference/quick-start-summary.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/referencia-rapida/referencia-rapida.svg
