At file:///home/pqm/archives/thelove/bzr/%2Btrunk/ ------------------------------------------------------------ revno: 3918 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Wed 2008-12-24 00:04:33 +0000 message: Fix send-related spelling typos (Karl Fogel) modified: bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 ------------------------------------------------------------ revno: 3917.1.1 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: ianc-integration timestamp: Wed 2008-12-24 09:23:20 +1000 message: Fix send-related spelling typos (Karl Fogel) modified: bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 ------------------------------------------------------------ revno: 3825.6.6 revision-id: [email protected] parent: [email protected] committer: Karl Fogel <[email protected]> branch nick: bzr.dev timestamp: Tue 2008-12-23 17:34:38 -0500 message: * bzr/bzr.dev/bzrlib/builtins.py (cmd_send, cmd_bundle_revisions): Fix typo: "submiting" --> "submitting". modified: bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 ------------------------------------------------------------ revno: 3825.6.5 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Karl Fogel <[email protected]> branch nick: bzr.dev timestamp: Tue 2008-12-23 17:28:32 -0500 message: Merge changes from main branch. modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66 bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1 bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37 bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9 bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1 bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3 bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64 bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2 bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1 bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51 bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2 bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1 bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309 bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1 bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1 bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77 bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3 bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1 bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324 bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1 bzrlib/xml7.py xml7.py-20061029182747-d5tiiny21bvrd2jj-1 bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1 bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3825.6.4 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Karl Fogel <[email protected]> branch nick: bzr.dev timestamp: Thu 2008-12-18 11:24:41 -0500 message: Merge changes from mainline. modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4 bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1 bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c ------------------------------------------------------------ revno: 3825.6.3 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Karl Fogel <[email protected]> branch nick: bzr.dev timestamp: Tue 2008-12-16 15:49:38 -0500 message: Merge from main branch. modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1 doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3825.6.2 revision-id: [email protected] parent: kfo...@floss-20081208171704-ghs5h0icwb8x2ovp parent: [email protected] committer: Karl Fogel <[email protected]> branch nick: bzr.dev timestamp: Tue 2008-12-16 15:49:23 -0500 message: Merge from main branch. added: bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1 bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1 bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1 bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1 bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1 bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2 bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2 modified: .bzrignore bzrignore-20050311232317-81f7b71efa2db11a Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1 bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825 bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1 bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37 bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9 bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1 bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1 bzrlib/merge.py merge.py-20050513021216-953b65a438527106 bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86 bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1 bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1 bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3 bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1 bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64 bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3 bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24 bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1 bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7 bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1 bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1 bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1 bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989 bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2 bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84 bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5 bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490 bzrlib/weave.py knit.py-20050627021749-759c29984154256b doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c setup.py setup.py-20050314065409-02f8a0a6e3f9bc70 ------------------------------------------------------------ revno: 3825.6.1 revision-id: kfo...@floss-20081208171704-ghs5h0icwb8x2ovp parent: [email protected] parent: [email protected] committer: Karl Fogel <kfo...@floss> branch nick: bzr.dev timestamp: Mon 2008-12-08 12:17:04 -0500 message: Merge from main branch. added: bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1 bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1 contrib/convert_to_1.9.py convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1 tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzr bzr.py-20050313053754-5485f144c7006fa6 bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1 bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1 bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1 bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7 bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1 bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825 bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8 bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1 bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1 bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9 bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1 bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2 bzrlib/option.py option.py-20051014052914-661fb36e76e7362f bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69 bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1 bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1 bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2 bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1 bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1 bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1 bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1 bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3 bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64 bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0 bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971 bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24 bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4 bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253 bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1 bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1 bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866 bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1 bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1 bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1 bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1 bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1 bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13 bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309 bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51 bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1 bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9 bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2 bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289 bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1 bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5 bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1 bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1 bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2 bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490 bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3 bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1 doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1 === modified file 'bzrlib/builtins.py' --- a/bzrlib/builtins.py 2008-12-16 16:05:28 +0000 +++ b/bzrlib/builtins.py 2008-12-23 22:34:38 +0000 @@ -4236,7 +4236,7 @@ class cmd_send(Command): - """Mail or create a merge-directive for submiting changes. + """Mail or create a merge-directive for submitting changes. A merge directive provides many things needed for requesting merges: @@ -4434,7 +4434,7 @@ class cmd_bundle_revisions(cmd_send): - """Create a merge-directive for submiting changes. + """Create a merge-directive for submitting changes. A merge directive provides many things needed for requesting merges:
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
