Rev 4667: Merge bzr.stable, resolve NEWS in http://bazaar.launchpad.net/~jameinel/bzr/2.0-cache-cix
John Arbash Meinel
john at arbash-meinel.com
Fri Oct 9 16:05:51 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.0-cache-cix
------------------------------------------------------------
revno: 4667 [merge]
revision-id: john at arbash-meinel.com-20091009150539-hh4rk5ra215x5pw1
parent: john at arbash-meinel.com-20091009150219-aof5zp3uybrcmi1f
parent: pqm at pqm.ubuntu.com-20091008185438-tzfn50dxdt4e46j1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-cache-cix
timestamp: Fri 2009-10-09 10:05:39 -0500
message:
Merge bzr.stable, resolve NEWS
removed:
doc/BUILD-NOTES buildnotes-20090722150335-qt9yh29f930m4v0r-3
doc/_static/en/quick-reference/ quickreference-20090722133816-63ik5s6s5gsnz7zy-3
doc/bazaar-vcs.org.kid bazaarvcs.org.kid-20060929181918-huv7bgmdey0ktqci-1
doc/en/developer-guide/ developerguide-20070810050627-g7r46azs5mlwj61j-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/es/developer-guide/ guiadesarrollador-20080504181514-qlh50dq1mj769bic-1
doc/es/release-notes/ notasversion-20080504181514-qlh50dq1mj769bic-4
doc/es/user-reference/ referencia-20080504181514-qlh50dq1mj769bic-5
added:
bzrlib/doc_generate/sphinx_conf.py sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
doc/Bazaar-Logo-For-Manuals.png bazaarlogoformanuals-20090902160154-ln5jf67zf01qxbbk-1
doc/developers/_static/ _static-20090907074210-zula633ky077z6vu-1
doc/developers/_static/bzr icon 16.png bzricon16.png-20090907074210-zula633ky077z6vu-11
doc/developers/_static/bzr.ico bzr.ico-20090907074210-zula633ky077z6vu-12
doc/developers/_templates/ _templates-20090907074210-zula633ky077z6vu-2
doc/developers/_templates/layout.html layout.html-20090907074245-4b4pm5q3bjw2pt27-1
doc/developers/conf.py conf.py-20090907074210-zula633ky077z6vu-4
doc/developers/implementation-notes.txt implementationnotes.-20090907074210-zula633ky077z6vu-5
doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
doc/developers/miscellaneous-notes.txt miscellaneousnotes.t-20090907074210-zula633ky077z6vu-7
doc/developers/plans.txt plans.txt-20090907074210-zula633ky077z6vu-8
doc/developers/process.txt process.txt-20090907074210-zula633ky077z6vu-9
doc/developers/specifications.txt specifications.txt-20090907074210-zula633ky077z6vu-10
doc/en/user-guide/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-2
doc/es/_static/ _static-20090907033837-wefd6s3j511so4xg-1
doc/es/_static/bzr icon 16.png bzricon16.png-20090907035530-u1c4vkpj8ki76jbr-6
doc/es/_static/bzr.ico bzr.ico-20090907035530-u1c4vkpj8ki76jbr-7
doc/es/_static/es/ es-20090907033837-wefd6s3j511so4xg-2
doc/es/_templates/ _templates-20090907035530-u1c4vkpj8ki76jbr-1
doc/es/_templates/layout.html layout.html-20090907060608-h0yq9dbax4xt09v5-1
doc/es/conf.py conf.py-20090907035530-u1c4vkpj8ki76jbr-4
doc/es/quick-reference/index.txt index.txt-20090907035530-u1c4vkpj8ki76jbr-2
doc/es/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-1
doc/index.es.txt index.es.txt-20090909123806-96yfsgrqwra8cwq7-3
doc/index.ru.txt index.ru.txt-20090909123806-96yfsgrqwra8cwq7-4
doc/ru/_static/ _static-20090907045539-lkv100jg78wa6i4u-1
doc/ru/_static/bzr icon 16.png bzricon16.png-20090907052526-fe9f0itd9ikgtasa-6
doc/ru/_static/bzr.ico bzr.ico-20090907052526-fe9f0itd9ikgtasa-7
doc/ru/_static/ru/ es-20090907045539-lkv100jg78wa6i4u-2
doc/ru/_templates/ _templates-20090907052526-fe9f0itd9ikgtasa-1
doc/ru/_templates/layout.html layout.html-20090908150437-pppigv0c2cky3qbk-1
doc/ru/conf.py conf.py-20090907052526-fe9f0itd9ikgtasa-4
doc/ru/quick-reference/index.txt index.txt-20090907052526-fe9f0itd9ikgtasa-2
doc/ru/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-2
tools/generate_release_notes.py generate_release_not-20090903045433-6vjlqni6dfgv2ekv-1
tools/package_docs.py package_docs.py-20090908145737-vqlo9aj3a46simtu-1
renamed:
doc/Makefile => doc/en/Makefile makefile-20090722133816-63ik5s6s5gsnz7zy-11
doc/_static/ => doc/en/_static/ _static-20090722133816-63ik5s6s5gsnz7zy-1
doc/_static/en/quick-reference/Makefile => doc/en/_static/en/Makefile makefile-20070813143223-5i7bgw7w8s7l3ae2-2
doc/_static/en/quick-reference/bzr-quick-reference.pdf => doc/en/_static/en/bzr-en-quick-reference.pdf quickstartsummary.pd-20071207005239-it6xmdjml8nxvzgt-1
doc/_static/en/quick-reference/bzr-quick-reference.png => doc/en/_static/en/bzr-en-quick-reference.png quickstartsummary.pn-20071203142852-hsiybkmh37q5owwe-1
doc/_static/en/quick-reference/bzr-quick-reference.svg => doc/en/_static/en/bzr-en-quick-reference.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/_templates/ => doc/en/_templates/ _templates-20090722133816-63ik5s6s5gsnz7zy-6
doc/conf.py => doc/en/conf.py conf.py-20090722133816-63ik5s6s5gsnz7zy-12
doc/contents.txt => doc/en/index.txt contents.txt-20090722133816-63ik5s6s5gsnz7zy-13
doc/en/developer-guide/HACKING.txt => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/index-for-2x.txt => doc/en/user-guide/index.txt indexfor2x.txt-20090722150335-qt9yh29f930m4v0r-1
doc/es/quick-reference/Makefile => doc/es/_static/es/Makefile makefile-20080506002609-y60mr4avuqwzlf4s-1
doc/es/quick-reference/quick-start-summary.pdf => doc/es/_static/es/bzr-es-quick-reference.pdf quickstartsummary.pd-20090629082853-j91s1jo1jwctk5qv-1
doc/es/quick-reference/quick-start-summary.png => doc/es/_static/es/bzr-es-quick-reference.png quickstartsummary.pn-20090629082853-j91s1jo1jwctk5qv-2
doc/es/quick-reference/quick-start-summary.svg => doc/es/_static/es/bzr-es-quick-reference.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
doc/index.es.txt => doc/es/index.txt index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
doc/index.ru.txt => doc/ru/index.txt index.ru.txt-20080819091426-kfq61l02dhm9pplk-1
doc/make.bat => doc/en/make.bat make.bat-20090722133816-63ik5s6s5gsnz7zy-14
doc/ru/quick-reference/Makefile => doc/ru/_static/ru/Makefile makefile-20080818031309-t3nyctvfbvfh4h2u-5
doc/ru/quick-reference/quick-start-summary.pdf => doc/ru/_static/ru/bzr-ru-quick-reference.pdf quickstartsummary.pd-20080818031309-t3nyctvfbvfh4h2u-6
doc/ru/quick-reference/quick-start-summary.png => doc/ru/_static/ru/bzr-ru-quick-reference.png quickstartsummary.pn-20080818031309-t3nyctvfbvfh4h2u-7
doc/ru/quick-reference/quick-start-summary.svg => doc/ru/_static/ru/bzr-ru-quick-reference.svg quickstartsummary.sv-20080818031309-t3nyctvfbvfh4h2u-8
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_btree_serializer_pyx.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_dirstate_helpers_pyx.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/per_interrepository/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_intertree/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/per_inventory/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/per_inventory/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_workingtree/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
doc/en/_templates/index.html index.html-20090722133849-lus2rzwsmlhpgqhv-1
doc/en/_templates/layout.html layout.html-20090722133849-lus2rzwsmlhpgqhv-2
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/quick-reference/index.txt index.txt-20090722133816-63ik5s6s5gsnz7zy-9
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/data_migration.txt data_migration.txt-20090702082510-q2pocf7uhntljqnl-2
doc/en/upgrade-guide/index.txt index.txt-20090702082510-q2pocf7uhntljqnl-3
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/organizing_your_workspace.txt organizing_your_work-20090226112520-bc2njq3kwvpeo814-1
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
doc/es/user-guide/index.txt index.txt-20080512005856-hgdxkh9xo58n7zdp-2
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
doc/en/_static/en/Makefile makefile-20070813143223-5i7bgw7w8s7l3ae2-2
doc/en/conf.py conf.py-20090722133816-63ik5s6s5gsnz7zy-12
doc/en/index.txt contents.txt-20090722133816-63ik5s6s5gsnz7zy-13
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/es/_static/es/Makefile makefile-20080506002609-y60mr4avuqwzlf4s-1
doc/es/index.txt index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
doc/ru/index.txt index.ru.txt-20080819091426-kfq61l02dhm9pplk-1
doc/ru/_static/ru/Makefile makefile-20080818031309-t3nyctvfbvfh4h2u-5
-------------- next part --------------
Diff too large for email (7607 lines, the limit is 1000).
More information about the bazaar-commits
mailing list