Viewing all changes in revision 3350.4.4.
- Committer: Robert Collins
- Date: 2008-05-12 02:40:40 UTC
- mfrom: (3350.3.22 data_stream_revamp)
- mto: (3350.5.2 VersionedFiles)
- mto: This revision was merged to the branch mainline in revision 3425.
- Revision ID: robertc@robertcollins.net-20080512024040-2aguup8smafxu3ol
Merge up bzr.dev.
- files added:
- bzrlib/help_topics/en/hooks.txt
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/util/configobj/docs
- files removed:
- bzrlib/_annotator_py.py
- bzrlib/filters
- bzrlib/plugins/netrc_credential_store
- bzrlib/plugins/netrc_credential_store/tests
- bzrlib/tests/ftp_server
- bzrlib/tests/per_interbranch
- bzrlib/tests/per_repository_chk
- bzrlib/tests/per_repository_reference
- bzrlib/tests/ssl_certs
- bzrlib/transport/ftp
- doc/es
- doc/es/developer-guide
- doc/es/mini-tutorial
- doc/es/quick-reference
- doc/es/release-notes
- doc/es/user-guide
- doc/es/user-reference
- doc/ru
- doc/ru/mini-tutorial
- doc/ru/quick-reference
- doc/ru/tutorials
- doc/ru/user-guide
- doc/ru/user-guide/images
- tools/packaging
- files renamed:
- bzrlib/_dirstate_helpers_pyx.h => bzrlib/_dirstate_helpers_c.h
- bzrlib/_dirstate_helpers_pyx.pyx => bzrlib/_dirstate_helpers_c.pyx
- bzrlib/_knit_load_data_pyx.pyx => bzrlib/_knit_load_data_c.pyx
- bzrlib/tests/ftp_server/medusa_based.py => bzrlib/tests/ftp_server.py
- bzrlib/tests/per_repository/ => bzrlib/tests/repository_implementations/
- bzrlib/transport/ftp/__init__.py => bzrlib/transport/ftp.py
- bzrlib/util/_bencode_py.py => bzrlib/util/bencode.py
- doc/en/developer-guide/HACKING.txt => doc/developers/HACKING.txt
- doc/en/user-guide/zen.txt => doc/en/user-guide/revnos.txt
- tools/generate_docs.py => generate_docs.py
- bzrlib/doc_generate/ => tools/doc_generate/
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/en/quick-reference/quick-start-summary.png
doc/en/user-guide/images/workflows_centralized.png
doc/en/user-guide/images/workflows_gatekeeper.png
doc/en/user-guide/images/workflows_localcommit.png
doc/en/user-guide/images/workflows_peer.png
doc/en/user-guide/images/workflows_pqm.png
doc/en/user-guide/images/workflows_shared.png
doc/en/user-guide/images/workflows_single.png
doc/es/quick-reference/quick-start-summary.png
doc/es/quick-reference/quick-start-summary.svg
doc/ru/quick-reference/quick-start-summary.png
doc/ru/quick-reference/quick-start-summary.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
