At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------ revno: 4993 [merge] revision-id: [email protected] parent: [email protected] parent: [email protected] committer: John Arbash Meinel <[email protected]> branch nick: jam-integration timestamp: Wed 2010-02-10 11:52:08 -0600 message: Merge bzr.dev 5021 to resolve NEWS removed: bzrlib/help_topics/es/ bzrlibhelp_topicses-20100104142927-3zk9dhyzgw3dqtkl-1 added: bzrlib/help_topics/es/ bzrlibhelp_topicses-20091223160038-qyu0zdzjfbx76ud7-1 renamed: bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1 modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95 bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3 bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42 bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d bzrlib/help_topics/en/conflict-types.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1 bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9 bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349 bzrlib/merge.py merge.py-20050513021216-953b65a438527106 bzrlib/option.py option.py-20051014052914-661fb36e76e7362f bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0 bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3 bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5 bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 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_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78 bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919 bzrlib/tests/per_branch/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef bzrlib/tests/per_branch/test_branch.py testbranch.py-20050711070244-121d632bc37d7253 bzrlib/tests/per_branch/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2 bzrlib/tests/per_branch/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1 bzrlib/tests/per_branch/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1 bzrlib/tests/per_branch/test_create_clone.py test_create_clone.py-20090225031440-8ybpkzojo7cvourv-1 bzrlib/tests/per_branch/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1 bzrlib/tests/per_branch/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1 bzrlib/tests/per_branch/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4 bzrlib/tests/per_branch/test_pull.py test_pull.py-20060410103942-83c35b26657414fc bzrlib/tests/per_branch/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1 bzrlib/tests/per_branch/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1 bzrlib/tests/per_branch/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1 bzrlib/tests/per_branch/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1 bzrlib/tests/per_branch/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f bzrlib/tests/per_merger.py per_merger.py-20091216002111-bzeo6wx2tcfpuj67-1 bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43 bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1 bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa 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_tree/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2 bzrlib/tests/per_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5 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/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174 bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5 bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024 bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2 bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4 bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09 bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71 bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687 bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9 bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478 bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2 bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3 doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1 profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
Diff too large for email (11676 lines, the limit is 1000).
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
