Rev 4611: Merge shell-like-tests into description in file:///home/vila/src/bzr/experimental/conflict-manager/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Sep 17 20:23:12 BST 2009


At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4611 [merge]
revision-id: v.ladeuil+lp at free.fr-20090917192311-y0chbtasqty04mhe
parent: v.ladeuil+lp at free.fr-20090916133807-7kv4fmifgvffxtyj
parent: v.ladeuil+lp at free.fr-20090917192306-wuyks6kne7l51z3h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Thu 2009-09-17 21:23:11 +0200
message:
  Merge shell-like-tests into description
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
  tools/packaging/update-control.sh updatecontrol.sh-20090525105938-f6wej3ydmflfuijk-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
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/bencode.py              bencode.py-20070806220735-j75g4ebfnado2i60-2
  bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
  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/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/groupcompress.py        groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/rio.py                  rio.py-20051128032247-770b120b34dfff60
  bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/per_interrepository/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
  bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
  bzrlib/tests/per_repository_chk/__init__.py __init__.py-20080925061730-e4g24t5xstp2n2vp-2
  bzrlib/tests/per_repository_chk/test_supported.py test_supported.py-20080925063728-k65ry0n2rhta6t34-1
  bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
  bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
  bzrlib/tests/per_workingtree/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/tests/per_workingtree/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-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/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-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/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-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
  tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
  tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
  tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
  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 (8614 lines, the limit is 1000).


More information about the bazaar-commits mailing list