Rev 4795: merge bzr.dev 4807, resolve test conflict in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-minor
John Arbash Meinel
john at arbash-meinel.com
Wed Nov 18 15:57:48 GMT 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-minor
------------------------------------------------------------
revno: 4795 [merge]
revision-id: john at arbash-meinel.com-20091118155739-6me86pvzc4tc69ai
parent: john at arbash-meinel.com-20091118155648-wqmyc0wf3ksxu96h
parent: pqm at pqm.ubuntu.com-20091118061814-695imx80olc79o7l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-minor
timestamp: Wed 2009-11-18 09:57:39 -0600
message:
merge bzr.dev 4807, resolve test conflict
added:
bzrlib/tests/test_patches_data/binary-after-normal.patch binaryafternormal.pa-20091103153908-9xu6wqrosgnjzk8e-1
doc/index.ja.txt index.ja.txt-20091029100035-1rni8rgpen0pe1g2-2
doc/ja/ ja-20091029100035-1rni8rgpen0pe1g2-1
doc/ja/_static/ _static-20091029100035-1rni8rgpen0pe1g2-3
doc/ja/_static/bzr icon 16.png bzricon16.png-20091029100035-1rni8rgpen0pe1g2-13
doc/ja/_static/bzr.ico bzr.ico-20091029100035-1rni8rgpen0pe1g2-14
doc/ja/_templates/ _templates-20091029100035-1rni8rgpen0pe1g2-4
doc/ja/conf.py conf.py-20091029100035-1rni8rgpen0pe1g2-10
doc/ja/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-11
doc/ja/mini-tutorial/ minitutorial-20091029100035-1rni8rgpen0pe1g2-5
doc/ja/mini-tutorial/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-15
doc/ja/tutorials/ tutorials-20091029100035-1rni8rgpen0pe1g2-6
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/ upgradeguide-20091029100035-1rni8rgpen0pe1g2-7
doc/ja/upgrade-guide/data_migration.txt data_migration.txt-20091029100035-1rni8rgpen0pe1g2-20
doc/ja/upgrade-guide/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-21
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/ userguide-20091029100035-1rni8rgpen0pe1g2-8
doc/ja/user-guide/adv_merging.txt adv_merging.txt-20091029100035-1rni8rgpen0pe1g2-25
doc/ja/user-guide/annotating_changes.txt annotating_changes.t-20091029100035-1rni8rgpen0pe1g2-26
doc/ja/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20091029100035-1rni8rgpen0pe1g2-27
doc/ja/user-guide/branching_a_project.txt branching_a_project.-20091029100035-1rni8rgpen0pe1g2-28
doc/ja/user-guide/browsing_history.txt browsing_history.txt-20091029100035-1rni8rgpen0pe1g2-29
doc/ja/user-guide/bug_trackers.txt bug_trackers.txt-20091029100035-1rni8rgpen0pe1g2-30
doc/ja/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20091029100035-1rni8rgpen0pe1g2-31
doc/ja/user-guide/central_intro.txt central_intro.txt-20091029100035-1rni8rgpen0pe1g2-32
doc/ja/user-guide/configuring_bazaar.txt configuring_bazaar.t-20091029100035-1rni8rgpen0pe1g2-33
doc/ja/user-guide/controlling_registration.txt controlling_registra-20091029100035-1rni8rgpen0pe1g2-34
doc/ja/user-guide/core_concepts.txt core_concepts.txt-20091029100035-1rni8rgpen0pe1g2-35
doc/ja/user-guide/distributed_intro.txt distributed_intro.tx-20091029100035-1rni8rgpen0pe1g2-36
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/images/ images-20091029100035-1rni8rgpen0pe1g2-24
doc/ja/user-guide/images/workflows_centralized.png workflows_centralize-20091029100035-1rni8rgpen0pe1g2-77
doc/ja/user-guide/images/workflows_centralized.svg workflows_centralize-20091029100035-1rni8rgpen0pe1g2-78
doc/ja/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20091029100035-1rni8rgpen0pe1g2-79
doc/ja/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20091029100035-1rni8rgpen0pe1g2-80
doc/ja/user-guide/images/workflows_localcommit.png workflows_localcommi-20091029100035-1rni8rgpen0pe1g2-81
doc/ja/user-guide/images/workflows_localcommit.svg workflows_localcommi-20091029100035-1rni8rgpen0pe1g2-82
doc/ja/user-guide/images/workflows_peer.png workflows_peer.png-20091029100035-1rni8rgpen0pe1g2-83
doc/ja/user-guide/images/workflows_peer.svg workflows_peer.svg-20091029100035-1rni8rgpen0pe1g2-84
doc/ja/user-guide/images/workflows_pqm.png workflows_pqm.png-20091029100035-1rni8rgpen0pe1g2-85
doc/ja/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20091029100035-1rni8rgpen0pe1g2-86
doc/ja/user-guide/images/workflows_shared.png workflows_shared.png-20091029100035-1rni8rgpen0pe1g2-87
doc/ja/user-guide/images/workflows_shared.svg workflows_shared.svg-20091029100035-1rni8rgpen0pe1g2-88
doc/ja/user-guide/images/workflows_single.png workflows_single.png-20091029100035-1rni8rgpen0pe1g2-89
doc/ja/user-guide/images/workflows_single.svg workflows_single.svg-20091029100035-1rni8rgpen0pe1g2-90
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/part2_intro.txt part2_intro.txt-20091029100035-1rni8rgpen0pe1g2-48
doc/ja/user-guide/partner_intro.txt partner_intro.txt-20091029100035-1rni8rgpen0pe1g2-49
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/recording_changes.txt recording_changes.tx-20091029100035-1rni8rgpen0pe1g2-52
doc/ja/user-guide/releasing_a_project.txt releasing_a_project.-20091029100035-1rni8rgpen0pe1g2-53
doc/ja/user-guide/resolving_conflicts.txt resolving_conflicts.-20091029100035-1rni8rgpen0pe1g2-54
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/shelving_changes.txt shelving_changes.txt-20091029100035-1rni8rgpen0pe1g2-61
doc/ja/user-guide/solo_intro.txt solo_intro.txt-20091029100035-1rni8rgpen0pe1g2-62
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/starting_a_project.txt starting_a_project.t-20091029100035-1rni8rgpen0pe1g2-65
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_aliases.txt using_aliases.txt-20091029100035-1rni8rgpen0pe1g2-68
doc/ja/user-guide/using_checkouts.txt using_checkouts.txt-20091029100035-1rni8rgpen0pe1g2-69
doc/ja/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20091029100035-1rni8rgpen0pe1g2-70
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/working_offline_central.txt working_offline_cent-20091029100035-1rni8rgpen0pe1g2-73
doc/ja/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20091029100035-1rni8rgpen0pe1g2-74
doc/ja/user-guide/zen.txt zen.txt-20091029100035-1rni8rgpen0pe1g2-75
doc/ja/user-reference/ userreference-20091029100035-1rni8rgpen0pe1g2-9
doc/ja/user-reference/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-76
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/per_branch/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_tree/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/per_workingtree/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/tests/script.py script.py-20090901081155-yk3tiy1nunxg16ne-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_script.py test_script.py-20090901081156-y90z4w2t62fv7e7b-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
-------------- next part --------------
Diff too large for email (25190 lines, the limit is 1000).
More information about the bazaar-commits
mailing list