Viewing all changes in revision 4593.5.21.
- Committer: John Arbash Meinel
- Date: 2009-08-17 15:38:52 UTC
- mfrom: (4615.1.1 2.0b1-merge-sort)
- mto: This revision was merged to the branch mainline in revision 4629.
- Revision ID: john@arbash-meinel.com-20090817153852-9127xf3aabmcoegt
Bring in the changes to merge_sort.
- files added:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- doc/_static/en/quick-reference
- doc/en/developer-guide
- doc/en/migration
- doc/es/developer-guide
- doc/es/release-notes
- doc/es/user-reference
- files removed:
- .testr.conf
- apport
- bzrlib/branchfmt
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_repository_vf
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/developers/_static
- doc/developers/_templates
- doc/en/whats-new
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- po
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_controldir/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/per_bzrdir/test_bzrdir.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/tests/per_versionedfile.py => bzrlib/tests/test_versionedfile.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- doc/en/Makefile => doc/Makefile
- doc/en/_static/ => doc/_static/
- doc/en/_static/en/Makefile => doc/_static/en/quick-reference/Makefile
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/_static/en/quick-reference/bzr-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/_static/en/quick-reference/bzr-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/_static/en/quick-reference/bzr-quick-reference.svg
- doc/en/_templates/ => doc/_templates/
- doc/en/conf.py => doc/conf.py
- doc/en/index.txt => doc/contents.txt
- doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt
- doc/en/user-guide/index.txt => doc/en/user-guide/index-for-2x.txt
- doc/es/_static/es/Makefile => doc/es/quick-reference/Makefile
- doc/es/_static/es/bzr-es-quick-reference.pdf => doc/es/quick-reference/quick-start-summary.pdf
- doc/es/_static/es/bzr-es-quick-reference.png => doc/es/quick-reference/quick-start-summary.png
- doc/es/_static/es/bzr-es-quick-reference.svg => doc/es/quick-reference/quick-start-summary.svg
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- doc/es/index.txt => doc/index.es.txt
- doc/ru/index.txt => doc/index.ru.txt
- doc/en/make.bat => doc/make.bat
- doc/ru/_static/ru/Makefile => doc/ru/quick-reference/Makefile
- doc/ru/_static/ru/bzr-ru-quick-reference.pdf => doc/ru/quick-reference/quick-start-summary.pdf
- doc/ru/_static/ru/bzr-ru-quick-reference.png => doc/ru/quick-reference/quick-start-summary.png
- doc/ru/_static/ru/bzr-ru-quick-reference.svg => doc/ru/quick-reference/quick-start-summary.svg
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/Bazaar-Logo-For-Manuals.png
doc/_static/en/quick-reference/bzr-quick-reference.png
doc/_static/en/quick-reference/bzr-quick-reference.svg
doc/developers/_static/bzr icon 16.png
doc/es/_static/bzr icon 16.png
doc/es/quick-reference/quick-start-summary.svg
doc/ja/_static/bzr icon 16.png
doc/ja/user-guide/images/workflows_centralized.png
doc/ja/user-guide/images/workflows_centralized.svg
doc/ja/user-guide/images/workflows_gatekeeper.png
doc/ja/user-guide/images/workflows_gatekeeper.svg
doc/ja/user-guide/images/workflows_localcommit.png
doc/ja/user-guide/images/workflows_localcommit.svg
doc/ja/user-guide/images/workflows_peer.png
doc/ja/user-guide/images/workflows_peer.svg
doc/ja/user-guide/images/workflows_pqm.png
doc/ja/user-guide/images/workflows_pqm.svg
doc/ja/user-guide/images/workflows_shared.png
doc/ja/user-guide/images/workflows_shared.svg
doc/ja/user-guide/images/workflows_single.png
doc/ja/user-guide/images/workflows_single.svg
doc/ru/_static/bzr icon 16.png
doc/ru/quick-reference/quick-start-summary.svg
