To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4354.3.18.
- Committer: Jelmer Vernooij
- Date: 2009-05-14 23:53:07 UTC
- mfrom: (4367 +trunk)
- mto: (4290.1.10 rio-serializer2)
- mto: This revision was merged to the branch mainline in revision 4368.
- Revision ID: jelmer@samba.org-20090514235307-lrw4xwiane0vvse4
Merge bzr.dev.
- files added:
- bzr.ico
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/export
- bzrlib/repofmt
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/ftp_server
- bzrlib/transport/ftp
- bzrlib/util/configobj
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- contrib/zsh
- doc/en/developer-guide
- 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
- files removed:
- .coveragerc
- apport
- breezy/archive
- breezy/bzr
- breezy/git
- breezy/git/notes
- breezy/git/tests
- breezy/help_topics/es
- breezy/plugins/bash_completion
- breezy/plugins/bash_completion/tests
- breezy/plugins/changelog_merge
- breezy/plugins/changelog_merge/tests
- breezy/plugins/commitfromnews
- breezy/plugins/commitfromnews/tests
- breezy/plugins/cvs
- breezy/plugins/darcs
- breezy/plugins/email
- breezy/plugins/email/tests
- breezy/plugins/fastimport
- breezy/plugins/fastimport/doc
- breezy/plugins/fastimport/processors
- breezy/plugins/fastimport/tests
- breezy/plugins/grep
- breezy/plugins/mtn
- breezy/plugins/news_merge
- breezy/plugins/news_merge/tests
- breezy/plugins/po_merge
- breezy/plugins/po_merge/tests
- breezy/plugins/repodebug
- breezy/plugins/repodebug/tests
- breezy/plugins/stats
- breezy/plugins/upload
- breezy/plugins/upload/tests
- breezy/plugins/weave_fmt
- breezy/tests/per_bzrdir
- breezy/tests/per_controldir_colo
- breezy/tests/per_foreign_vcs
- breezy/tests/per_repository_vf
- breezy/tests/per_uifactory
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/developers/plans
- doc/developers/plans/performance
- doc/developers/proposals
- doc/en/_static
- doc/en/_static/en
- doc/en/_templates
- doc/en/upgrade-guide
- doc/en/whats-new
- po
- tools/win32/buildout-templates
- tools/win32/buildout-templates/bin
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- README.rst => README
- brz => bzr
- breezy/ => bzrlib/
- breezy/bzr/_btree_serializer_pyx.pyx => bzrlib/_btree_serializer_c.pyx
- breezy/bzr/_btree_serializer_py.py => bzrlib/_btree_serializer_py.py
- breezy/bzr/_chk_map_py.py => bzrlib/_chk_map_py.py
- breezy/bzr/_chk_map_pyx.pyx => bzrlib/_chk_map_pyx.pyx
- breezy/bzr/_dirstate_helpers_pyx.h => bzrlib/_dirstate_helpers_c.h
- breezy/bzr/_dirstate_helpers_pyx.pyx => bzrlib/_dirstate_helpers_c.pyx
- breezy/bzr/_dirstate_helpers_py.py => bzrlib/_dirstate_helpers_py.py
- breezy/bzr/_groupcompress_py.py => bzrlib/_groupcompress_py.py
- breezy/bzr/_groupcompress_pyx.pyx => bzrlib/_groupcompress_pyx.pyx
- breezy/bzr/_knit_load_data_pyx.pyx => bzrlib/_knit_load_data_c.pyx
- breezy/bzr/_knit_load_data_py.py => bzrlib/_knit_load_data_py.py
- breezy/bzr/btree_index.py => bzrlib/btree_index.py
- breezy/bzr/bzrdir.py => bzrlib/bzrdir.py
- breezy/bzr/chk_map.py => bzrlib/chk_map.py
- breezy/bzr/chk_serializer.py => bzrlib/chk_serializer.py
- breezy/bzr/delta.h => bzrlib/delta.h
- breezy/bzr/diff-delta.c => bzrlib/diff-delta.c
- breezy/bzr/dirstate.py => bzrlib/dirstate.py
- breezy/export.py => bzrlib/export/__init__.py
- breezy/archive/tar.py => bzrlib/export/tar_exporter.py
- breezy/archive/zip.py => bzrlib/export/zip_exporter.py
- breezy/bzr/groupcompress.py => bzrlib/groupcompress.py
- breezy/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- breezy/bzr/index.py => bzrlib/index.py
- breezy/bzr/inventory.py => bzrlib/inventory.py
- breezy/bzr/inventory_delta.py => bzrlib/inventory_delta.py
- breezy/bzr/knit.py => bzrlib/knit.py
- breezy/bzr/pack.py => bzrlib/pack.py
- breezy/bzr/remote.py => bzrlib/remote.py
- breezy/bzr/groupcompress_repo.py => bzrlib/repofmt/groupcompress_repo.py
- breezy/bzr/knitrepo.py => bzrlib/repofmt/knitrepo.py
- breezy/bzr/pack_repo.py => bzrlib/repofmt/pack_repo.py
- breezy/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- breezy/bzr/serializer.py => bzrlib/serializer.py
- breezy/commit_signature_commands.py => bzrlib/sign_my_commits.py
- breezy/bzr/smart/ => bzrlib/smart/
- breezy/plugins/weave_fmt/store/ => bzrlib/store/
- breezy/plugins/weave_fmt/store/versioned.py => bzrlib/store/versioned/__init__.py
- breezy/tests/per_branch/ => bzrlib/tests/branch_implementations/
- breezy/tests/per_controldir/ => bzrlib/tests/bzrdir_implementations/
- breezy/tests/per_controldir/test_controldir.py => bzrlib/tests/bzrdir_implementations/test_bzrdir.py
- breezy/tests/per_interrepository/ => bzrlib/tests/interrepository_implementations/
- breezy/tests/per_intertree/ => bzrlib/tests/intertree_implementations/
- breezy/tests/per_inventory/ => bzrlib/tests/inventory_implementations/
- breezy/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- breezy/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- breezy/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- breezy/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- breezy/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- breezy/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- breezy/tests/per_pack_repository.py => bzrlib/tests/test_pack_repository.py
- breezy/plugins/weave_fmt/test_store.py => bzrlib/tests/test_store.py
- breezy/tests/per_transport.py => bzrlib/tests/test_transport_implementations.py
- breezy/tests/per_versionedfile.py => bzrlib/tests/test_versionedfile.py
- breezy/tests/per_tree/ => bzrlib/tests/tree_implementations/
- breezy/tests/per_workingtree/ => bzrlib/tests/workingtree_implementations/
- breezy/tests/per_tree/test_get_file_with_stat.py => bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py
- breezy/bzr/textinv.py => bzrlib/textinv.py
- breezy/util/_bencode_py.py => bzrlib/util/bencode.py
- breezy/bzr/versionedfile.py => bzrlib/versionedfile.py
- breezy/bzr/weave.py => bzrlib/weave.py
- breezy/bzr/weavefile.py => bzrlib/weavefile.py
- breezy/bzr/workingtree_4.py => bzrlib/workingtree_4.py
- breezy/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- breezy/bzr/xml5.py => bzrlib/xml5.py
- breezy/bzr/xml6.py => bzrlib/xml6.py
- breezy/bzr/xml7.py => bzrlib/xml7.py
- breezy/bzr/xml8.py => bzrlib/xml8.py
- breezy/bzr/xml_serializer.py => bzrlib/xml_serializer.py
- contrib/bash/brzbashprompt.sh => contrib/bash/bzrbashprompt.sh
- contrib/brz_access => contrib/bzr_access
- contrib/emacs/brz-mode.el => contrib/emacs/bzr-mode.el
- doc/developers/plans/performance/add.txt => doc/developers/add.txt
- doc/developers/plans/performance/annotate.txt => doc/developers/annotate.txt
- doc/developers/plans/performance/bundle-creation.txt => doc/developers/bundle-creation.txt
- doc/developers/plans/performance/commit.txt => doc/developers/commit.txt
- doc/developers/plans/performance/diff.txt => doc/developers/diff.txt
- doc/developers/plans/performance/directory-fingerprints.txt => doc/developers/directory-fingerprints.txt
- doc/developers/plans/performance/gc.txt => doc/developers/gc.txt
- doc/developers/plans/performance/incremental-push-pull.txt => doc/developers/incremental-push-pull.txt
- doc/developers/plans/performance/initial-push-pull.txt => doc/developers/initial-push-pull.txt
- doc/developers/plans/performance/merge-scaling.txt => doc/developers/merge-scaling.txt
- doc/developers/plans/performance/missing.txt => doc/developers/missing.txt
- doc/developers/plans/performance/roadmap.txt => doc/developers/performance-roadmap.txt
- doc/developers/plans/performance/performance-use-case-analysis.txt => doc/developers/performance-use-case-analysis.txt
- doc/developers/plans/performance/planned-change-integration.txt => doc/developers/planned-change-integration.txt
- doc/developers/plans/performance/planned-performance-changes.txt => doc/developers/planned-performance-changes.txt
- doc/developers/plans/performance/revert.txt => doc/developers/revert.txt
- doc/developers/plans/performance/status.txt => doc/developers/status.txt
- doc/developers/plans/tortoise-strategy.txt => doc/developers/tortoise-strategy.txt
- doc/developers/plans/performance/uncommit.txt => doc/developers/uncommit.txt
- doc/developers/plans/performance/update.txt => doc/developers/update.txt
- doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt
- doc/en/_static/en/Makefile => doc/en/quick-reference/Makefile
- doc/en/_static/en/brz-en-quick-reference.pdf => doc/en/quick-reference/quick-start-summary.pdf
- doc/en/_static/en/brz-en-quick-reference.png => doc/en/quick-reference/quick-start-summary.png
- doc/en/_static/en/brz-en-quick-reference.svg => doc/en/quick-reference/quick-start-summary.svg
- doc/en/tutorials/using_breezy_with_launchpad.txt => doc/en/tutorials/using_bazaar_with_launchpad.txt
- doc/en/user-guide/breezy_workflows.txt => doc/en/user-guide/bazaar_workflows.txt
- doc/en/user-guide/configuring_breezy.txt => doc/en/user-guide/configuring_bazaar.txt
- doc/en/user-guide/installing_breezy.txt => doc/en/user-guide/installing_bazaar.txt
- doc/en/user-guide/introducing_breezy.txt => doc/en/user-guide/introducing_bazaar.txt
- breezy/help_topics/es/conflict-types.txt => doc/es/guia-usuario/resolving_conflicts.txt
- tools/generate_docs.py => generate_docs.py
- tools/brz_epydoc => tools/bzr_epydoc
- tools/brz_epydoc_uid.py => tools/bzr_epydoc_uid.py
- breezy/doc_generate/ => tools/doc_generate/
- tools/win32/breezy.url => tools/win32/bazaar.url
- tools/win32/brz-win32-bdist-postinstall.py => tools/win32/bzr-win32-bdist-postinstall.py
- tools/win32/brz.iss.cog => tools/win32/bzr.iss.cog
- tools/win32/brz_postinstall.py => tools/win32/bzr_postinstall.py
- tools/win32/start_brz.bat => tools/win32/start_bzr.bat
- 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_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/referencia-rapida/referencia-rapida.svg
