Viewing all changes in revision 2900.2.25.
- Committer: Vincent Ladeuil
- Date: 2007-11-04 15:29:17 UTC
- mfrom: (2961 +trunk)
- mto: (2961.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 2962.
- Revision ID: v.ladeuil+lp@free.fr-20071104152917-nrsumxpk3dikso2c
Merge bzr.dev
- files added:
- bzrlib/plugins/multiparent.py
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- files removed:
- bzrlib/_btree_serializer_c.pyx
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/tests/per_repository_reference
- bzrlib/transport/ftp
- doc/en/admin-guide
- doc/en/tutorials
- doc/en/user-guide/images
- 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/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/test_revisionspec.py => bzrlib/tests/test_revisionnamespaces.py
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/xml8.py => bzrlib/xml5.py
- doc/developers/packrepo.txt => doc/developers/knitpack.txt
- bzrlib/help_topics/en/authentication.txt => doc/en/user-guide/authentication_conf.txt
- doc/en/tutorials/centralized_workflow.txt => doc/en/user-guide/centralized_workflow.txt
- bzrlib/help_topics/en/configuration.txt => doc/en/user-guide/configuration.txt
- bzrlib/help_topics/en/conflicts.txt => doc/en/user-guide/conflicts.txt
- doc/en/tutorials/tutorial.txt => doc/en/user-guide/tutorial.txt
- bzrlib/help_topics/en/hooks.txt => doc/en/user-reference/hooks.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
