Rev 5390: Merge bzr.dev 5387 in prep for NEWS in http://bazaar.launchpad.net/~jameinel/bzr/2.3-btree-chk-leaf

John Arbash Meinel john at arbash-meinel.com
Mon Aug 23 18:54:35 BST 2010


At http://bazaar.launchpad.net/~jameinel/bzr/2.3-btree-chk-leaf

------------------------------------------------------------
revno: 5390 [merge]
revision-id: john at arbash-meinel.com-20100823175407-yomx2h1x5v8amt6w
parent: john at arbash-meinel.com-20100823175117-hr3b7p8gkw4ap8bb
parent: pqm at pqm.ubuntu.com-20100821170954-efrj80bvw56s5mzc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.3-btree-chk-leaf
timestamp: Mon 2010-08-23 12:54:07 -0500
message:
  Merge bzr.dev 5387 in prep for NEWS
added:
  bzrlib/tests/test_versionedfile.py test_versionedfile.p-20100810180118-kszg2mcbpsoybwpt-1
  doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
  tools/win32/py2exe_boot_common.py boot_common.py-20100726104937-42rsvhmwpm52nrv5-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/_groupcompress_pyx.pyx  _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
  bzrlib/_simple_set_pyx.pyx     _static_tuple_intern-20091002053806-sid67p8spedru51w-1
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/clean_tree.py           clean_tree.py-20050827022328-5ba46e22d074695c
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/diff-delta.c            diffdelta.c-20090226042143-l9wzxynyuxnb5hus-1
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/generate_ids.py         generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
  bzrlib/groupcompress.py        groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
  bzrlib/tests/features.py       features.py-20090820042958-jglgza3wrn03ha9e-1
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/per_workingtree/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
  bzrlib/tests/per_workingtree/test_symlinks.py test_symlinks.py-20100715135626-4lw38d8njbzyec6l-1
  bzrlib/tests/test__simple_set.py test__static_tuple_i-20091002053806-sid67p8spedru51w-2
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_clean_tree.py test_clean_tree.py-20060603174249-ozlk5sl2166opxbk-1
  bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/tests/test_globbing.py  test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
  bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_inventory_delta.py test_journalled_inv.-20080103012121-ny2w9slze5jgty8i-1
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
  doc/developers/content-filtering.txt contentfiltering.txt-20090825034801-16mynkm76jpmi4tp-1
  doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
  doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
  doc/developers/overview.txt    overview.txt-20080904022501-ww2ggomrs5elxfm0-1
  doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
  doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/en/_templates/index.html   index.html-20090722133849-lus2rzwsmlhpgqhv-1
  doc/en/admin-guide/code-browsing.txt codebrowsing.txt-20091205144603-lgpl0e0z6lzk2rdw-3
  doc/en/admin-guide/hooks-plugins.txt hooksplugins.txt-20091205144603-lgpl0e0z6lzk2rdw-5
  doc/en/admin-guide/migration.txt migration.txt-20091205144603-lgpl0e0z6lzk2rdw-8
  doc/en/admin-guide/upgrade.txt upgrade.txt-20091205144603-lgpl0e0z6lzk2rdw-12
  doc/en/index.txt               contents.txt-20090722133816-63ik5s6s5gsnz7zy-13
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
  doc/en/tutorials/tutorial.txt  tutorial.txt-20050804190939-9dcbba2ef053bc84
  doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
  doc/en/upgrade-guide/overview.txt overview.txt-20090702082510-q2pocf7uhntljqnl-4
  doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
  doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
  doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
  doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
  doc/en/user-guide/plugins.txt  plugins.txt-20060314145616-525099a747f3ffdd
  doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
  doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
  doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
  doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
  doc/en/user-reference/readme.txt readme.txt-20071211133352-guencaey6fpesv4j-1
  doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
  doc/es/index.txt               index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
  doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
  doc/index.es.txt               index.es.txt-20090909123806-96yfsgrqwra8cwq7-3
  doc/index.ja.txt               index.ja.txt-20091029100035-1rni8rgpen0pe1g2-2
  doc/index.ru.txt               index.ru.txt-20090909123806-96yfsgrqwra8cwq7-4
  doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
  doc/ja/index.txt               index.txt-20091029100035-1rni8rgpen0pe1g2-11
  doc/ja/mini-tutorial/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-15
  doc/ja/tutorials/centralized_workflow.txt centralized_workflow-20091029100035-1rni8rgpen0pe1g2-16
  doc/ja/tutorials/tutorial.txt  tutorial.txt-20091029100035-1rni8rgpen0pe1g2-18
  doc/ja/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_la-20091029100035-1rni8rgpen0pe1g2-19
  doc/ja/upgrade-guide/overview.txt overview.txt-20091029100035-1rni8rgpen0pe1g2-22
  doc/ja/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20091029100035-1rni8rgpen0pe1g2-31
  doc/ja/user-guide/installing_bazaar.txt installing_bazaar.tx-20091029100035-1rni8rgpen0pe1g2-43
  doc/ja/user-guide/introducing_bazaar.txt introducing_bazaar.t-20091029100035-1rni8rgpen0pe1g2-44
  doc/ja/user-guide/plugins.txt  plugins.txt-20091029100035-1rni8rgpen0pe1g2-50
  doc/ja/user-guide/server.txt   server.txt-20091029100035-1rni8rgpen0pe1g2-58
  doc/ja/user-guide/shared_repository_layouts.txt shared_repository_la-20091029100035-1rni8rgpen0pe1g2-60
  doc/ja/user-guide/svn_plugin.txt svn_plugin.txt-20091029100035-1rni8rgpen0pe1g2-66
  doc/ja/user-guide/web_browsing.txt web_browsing.txt-20091029100035-1rni8rgpen0pe1g2-72
  doc/ja/user-reference/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-76
  doc/ru/index.txt               index.ru.txt-20080819091426-kfq61l02dhm9pplk-1
  doc/ru/mini-tutorial/index.txt index.txt-20080818031309-t3nyctvfbvfh4h2u-4
  doc/ru/tutorials/centralized_workflow.txt centralized_workflow-20090531190825-ex3ums4bcuaf2r6k-1
  doc/ru/tutorials/tutorial.txt  tutorial.txt-20090602180629-wkp7wr27jl4i2zep-1
  doc/ru/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_la-20090427084917-b22ppqtdx7q4hapw-1
  doc/ru/user-guide/introducing_bazaar.txt introducing_bazaar.t-20090601221109-6ehwbt2pvzgpftlu-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
-------------- next part --------------

Diff too large for email (5520 lines, the limit is 1000).


More information about the bazaar-commits mailing list