Rev 5373: Bring bzr.dev 5912 back into gz's branch. in http://bazaar.launchpad.net/~jameinel/gz-orig

John Arbash Meinel john at arbash-meinel.com
Wed May 25 07:35:05 UTC 2011


At http://bazaar.launchpad.net/~jameinel/gz-orig

------------------------------------------------------------
revno: 5373 [merge]
revision-id: john at arbash-meinel.com-20110525073439-y57qp2jig0z05zvo
parent: gzlist at googlemail.com-20110520093403-nxm3ik0zfyp0107j
parent: pqm at pqm.ubuntu.com-20110524200712-z0ay7c4lsbg1x7qs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gz-orig
timestamp: Wed 2011-05-25 09:34:39 +0200
message:
  Bring bzr.dev 5912 back into gz's branch.
added:
  doc/ja/tutorials/licence.txt   licence.txt-20110518055942-ad1wgd5123ziom6l-1
  doc/ja/user-guide/index-plain.txt indexplain.txt-20110518055954-ebhw1bsyxp59mzdu-1
  doc/ja/user-guide/licence.txt  licence.txt-20110518055954-ebhw1bsyxp59mzdu-2
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/cethread.py             thread.py-20110208152810-i29un3um8v6marcr-1
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/chunk_writer.py         chunk_writer.py-20080630234519-6ggn4id17nipovny-1
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/controldir.py           controldir.py-20100802102926-hvtvh0uae5epuibp-1
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
  bzrlib/email_message.py        email_message.py-20070718143823-660zfcl54xi1v65u-1
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/groupcompress.py        groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
  bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/inter.py                inter.py-20060302012326-a57300cb382c618f
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lazy_import.py          lazy_import.py-20060910203832-f77c54gf3n232za0-1
  bzrlib/lazy_regex.py           lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/plugins/weave_fmt/repository.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/plugins/weave_fmt/workingtree.py workingtree_2.py-20110303111903-b6uksp28mf3oo3vp-1
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
  bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/per_branch/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/per_interbranch/test_fetch.py test_fetch.py-20110326014954-0viktxgz0w71zcld-1
  bzrlib/tests/per_interrepository/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
  bzrlib/tests/per_transport.py  test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/vf_repository.py        vf_repository.py-20110502151858-yh9nnoxpokg86unk-1
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_3.py        workingtree_3.py-20110503234428-nwa1nw7zfdd0hrw8-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/en/user-guide/stacked.txt  stacked.txt-20080711023247-4uh9oovoka0sze8b-1
  doc/en/whats-new/whats-new-in-2.4.txt whatsnewin2.4.txt-20110114044330-nipk1og7j729fy89-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/index.txt     index.txt-20091029100035-1rni8rgpen0pe1g2-17
  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/data_migration.txt data_migration.txt-20091029100035-1rni8rgpen0pe1g2-20
  doc/ja/upgrade-guide/overview.txt overview.txt-20091029100035-1rni8rgpen0pe1g2-22
  doc/ja/upgrade-guide/tips_and_tricks.txt tips_and_tricks.txt-20091029100035-1rni8rgpen0pe1g2-23
  doc/ja/user-guide/adv_merging.txt adv_merging.txt-20091029100035-1rni8rgpen0pe1g2-25
  doc/ja/user-guide/branching_a_project.txt branching_a_project.-20091029100035-1rni8rgpen0pe1g2-28
  doc/ja/user-guide/bug_trackers.txt bug_trackers.txt-20091029100035-1rni8rgpen0pe1g2-30
  doc/ja/user-guide/configuring_bazaar.txt configuring_bazaar.t-20091029100035-1rni8rgpen0pe1g2-33
  doc/ja/user-guide/entering_commands.txt entering_commands.tx-20091029100035-1rni8rgpen0pe1g2-37
  doc/ja/user-guide/filtered_views.txt filtered_views.txt-20091029100035-1rni8rgpen0pe1g2-38
  doc/ja/user-guide/getting_help.txt getting_help.txt-20091029100035-1rni8rgpen0pe1g2-39
  doc/ja/user-guide/hooks.txt    hooks.txt-20091029100035-1rni8rgpen0pe1g2-40
  doc/ja/user-guide/http_smart_server.txt http_smart_server.tx-20091029100035-1rni8rgpen0pe1g2-41
  doc/ja/user-guide/index.txt    index.txt-20091029100035-1rni8rgpen0pe1g2-42
  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/merging_changes.txt merging_changes.txt-20091029100035-1rni8rgpen0pe1g2-45
  doc/ja/user-guide/organizing_branches.txt organizing_branches.-20091029100035-1rni8rgpen0pe1g2-46
  doc/ja/user-guide/organizing_your_workspace.txt organizing_your_work-20091029100035-1rni8rgpen0pe1g2-47
  doc/ja/user-guide/plugins.txt  plugins.txt-20091029100035-1rni8rgpen0pe1g2-50
  doc/ja/user-guide/publishing_a_branch.txt publishing_a_branch.-20091029100035-1rni8rgpen0pe1g2-51
  doc/ja/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20091029100035-1rni8rgpen0pe1g2-55
  doc/ja/user-guide/reviewing_changes.txt reviewing_changes.tx-20091029100035-1rni8rgpen0pe1g2-56
  doc/ja/user-guide/sending_changes.txt sending_changes.txt-20091029100035-1rni8rgpen0pe1g2-57
  doc/ja/user-guide/server.txt   server.txt-20091029100035-1rni8rgpen0pe1g2-58
  doc/ja/user-guide/setting_up_email.txt setting_up_email.txt-20091029100035-1rni8rgpen0pe1g2-59
  doc/ja/user-guide/shared_repository_layouts.txt shared_repository_la-20091029100035-1rni8rgpen0pe1g2-60
  doc/ja/user-guide/specifying_revisions.txt specifying_revisions-20091029100035-1rni8rgpen0pe1g2-63
  doc/ja/user-guide/stacked.txt  stacked.txt-20091029100035-1rni8rgpen0pe1g2-64
  doc/ja/user-guide/svn_plugin.txt svn_plugin.txt-20091029100035-1rni8rgpen0pe1g2-66
  doc/ja/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20091029100035-1rni8rgpen0pe1g2-67
  doc/ja/user-guide/using_checkouts.txt using_checkouts.txt-20091029100035-1rni8rgpen0pe1g2-69
  doc/ja/user-guide/version_info.txt version_info.txt-20091029100035-1rni8rgpen0pe1g2-71
  doc/ja/user-guide/web_browsing.txt web_browsing.txt-20091029100035-1rni8rgpen0pe1g2-72
  doc/ja/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20091029100035-1rni8rgpen0pe1g2-74
  doc/ja/user-reference/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-76
-------------- next part --------------

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


More information about the bazaar-commits mailing list