Rev 1761: current status in file:///home/robertc/source/baz/local-files-open-with-right-mode/

Robert Collins robertc at robertcollins.net
Wed Aug 9 00:19:52 BST 2006


------------------------------------------------------------
revno: 1761
revision-id: robertc at robertcollins.net-20060808231929-4e3e298190214b3a
parent: robertc at robertcollins.net-20060609190333-7aadb213bbaa16e2
parent: pqm at pqm.ubuntu.com-20060725135859-f810b8a9929427a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: local-files-open-with-right-mode
timestamp: Wed 2006-08-09 09:19:29 +1000
message:
  current status
removed:
  foo bar                        foobar-20060607154839-33126929dffd5072
added:
  bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
  bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
  bzrlib/ignores.py              ignores.py-20060712153832-2von9l0t7p43ixsv-1
  bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
  bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
  bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
  bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
  bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
  bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/lock_helpers.py   LockHelpers.py-20060707151933-tav3o2hpibwi53u4-1
  bzrlib/tests/test_delta.py     test_delta.py-20060721145444-xlj6hoiipa8ekkwj-1
  bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
  bzrlib/tests/test_ignores.py   test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
  bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
  bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
  bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
  bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
  bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
  bzrlib/transport/http/_pycurl_errors.py _pycurl_errors.py-20060714003436-4zste49ltg697ft9-1
  bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
  profile_imports.py             profile_imports.py-20060618020306-k5uw80achysrokj9-1
renamed:
  bzrlib/bundle/read_bundle.py => bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/bundle/serializer/v07.py => bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/atomicfile.py           atomicfile.py-20050509044450-dbd24e6c564f7c66
  bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
  bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
  bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/bundle/apply_bundle.py  apply_changeset.py-20050620044656-dba4eb8021a36f95
  bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
  bzrlib/bundle/common.py        common.py-20050619223838-f25048f6638f04c6
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
  bzrlib/doc/api/branch.txt      branch.txt-20060130010728-d96c35d50b205aed
  bzrlib/doc/api/transport.txt   transport.txt-20051224020744-66b4fb564d98a5a5
  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/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/iterablefile.py         iterablefile.py-20051225230610-c93e5550a82115ed
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/lsprof.py               lsprof.py-20051208071030-833790916798ceed
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/patch.py                patch.py-20050513021216-ad183543f56ee2e5
  bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
  bzrlib/patiencediff.py         cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
  bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
  bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
  bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
  bzrlib/store/text.py           text.py-20050928201105-c26468dcb5d9b18b
  bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
  bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
  bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
  bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
  bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  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_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
  bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
  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_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  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_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
  bzrlib/tests/repository_implementations/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
  bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
  bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
  bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_textfile.py  test_textfile.py-20060415001558-256482b2206362aa
  bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_tuned_gzip.py test_tuned_gzip.py-20060418042056-c576dfc708984968
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
  bzrlib/tests/test_whitebox.py  whitebox.py-20050530064534-a063aafb4a0a3a04
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/treeshape.py      treeshape.py-20051004094628-312a98f0194306a8
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/tests/workingtree_implementations/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
  bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
  bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/textfile.py             textfile.py-20060415001558-9cc2f3652ca99f97
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/fakenfs.py    fakenfs.py-20060402223312-0e29c7275aa384dd
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  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/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
  bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  bzrlib/weave_commands.py       weave_commands.py-20060320231507-8e9f300bffc1aa19
  bzrlib/win32console.py         win32console.py-20051021033308-123c6c929d04973d
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/xml4.py                 xml4.py-20050916091259-db5ab55e7e6ca324
  bzrlib/xml5.py                 xml5.py-20050907032657-aac8f960815b66b1
  bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
  doc/README.1st                 README.1st-20060314161707-b943d5d4cce669b6
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  doc/setting_up_email.txt       setting_up_email.txt-20060314161707-fd242c8944346173
  doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060725135859-f810b8a9929427a5
    parent: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
    parent: john at arbash-meinel.com-20060725134442-40a49b0689c754e0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-25 14:58:59 +0100
    message:
      small NEWS fixes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060725134442-40a49b0689c754e0
        parent: john at arbash-meinel.com-20060725134201-91a611e590f75948
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-25 08:44:42 -0500
        message:
          (Adeodato Simó) small NEWS typo
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060725134201-91a611e590f75948
        parent: john at arbash-meinel.com-20060722153743-3aae2e694c14761f
        parent: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-25 08:42:01 -0500
        message:
          [merge] bzr.dev 
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060722153743-3aae2e694c14761f
        parent: john at arbash-meinel.com-20060721203204-5a6207700efd89c9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Sat 2006-07-22 10:37:43 -0500
        message:
          Updated NEWS for fixing bug #40693
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
    parent: pqm at pqm.ubuntu.com-20060725005347-58e24243afe3e03f
    parent: john at arbash-meinel.com-20060725005817-050814b605553e22
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-25 02:06:54 +0100
    message:
      (jam) fix compare_trees when only unversioned filenames are passed (bug #53638)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060725005817-050814b605553e22
        parent: john at arbash-meinel.com-20060721203109-8209e2a78cbc891f
        parent: pqm at pqm.ubuntu.com-20060725005347-58e24243afe3e03f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: compare-unknown-trees-53638
        timestamp: Mon 2006-07-24 19:58:17 -0500
        message:
          [merge] bzr.dev 1882
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721203109-8209e2a78cbc891f
        parent: john at arbash-meinel.com-20060721151102-2c70b5da4d3924af
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: compare-unknown-trees-53638
        timestamp: Fri 2006-07-21 15:31:09 -0500
        message:
          Fix incorrect variable use. it worked, but it wasn't the correct one to use.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721151102-2c70b5da4d3924af
        parent: john at arbash-meinel.com-20060721150847-8b6bf0765ed4cc57
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: compare-unknown-trees-53638
        timestamp: Fri 2006-07-21 10:11:02 -0500
        message:
          Add a test and fix for bug #53638
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721150847-8b6bf0765ed4cc57
        parent: john at arbash-meinel.com-20060721145753-f47d091694e9001f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: compare-unknown-trees-53638
        timestamp: Fri 2006-07-21 10:08:47 -0500
        message:
          Add a bunch of direct (passing) tests for compare_trees
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721145753-f47d091694e9001f
        parent: pqm at pqm.ubuntu.com-20060721054643-20c103c916447e25
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: compare-unknown-trees-53638
        timestamp: Fri 2006-07-21 09:57:53 -0500
        message:
          adding some direct tests for compare_trees
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060725005347-58e24243afe3e03f
    parent: pqm at pqm.ubuntu.com-20060724034248-d4d33393b6327d71
    parent: john at arbash-meinel.com-20060721194948-5378854eeb7d2cad
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-25 01:53:47 +0100
    message:
      (jam) Update LocationConfig to support local paths again.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721194948-5378854eeb7d2cad
        parent: john at arbash-meinel.com-20060721182010-5ec446c9671e7efc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: config-urls-53653
        timestamp: Fri 2006-07-21 14:49:48 -0500
        message:
          some test cleanups
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721182010-5ec446c9671e7efc
        parent: john at arbash-meinel.com-20060721175222-bf7499a71473f2f0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: config-urls-53653
        timestamp: Fri 2006-07-21 13:20:10 -0500
        message:
          Add a test that new locations.conf entries are created with a local path, rather than a URL
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721175222-bf7499a71473f2f0
        parent: pqm at pqm.ubuntu.com-20060721054643-20c103c916447e25
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: config-urls-53653
        timestamp: Fri 2006-07-21 12:52:22 -0500
        message:
          Entries in locations.conf should prefer local paths if available (bug #53653)
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060724034248-d4d33393b6327d71
    parent: pqm at pqm.ubuntu.com-20060724022408-87f9120f8eea8cf8
    parent: robertc at robertcollins.net-20060724033026-8469839ffec08a7e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-24 04:42:48 +0100
    message:
      (robertc) Deprecated EmptyTree in favour of Repository.revision_tree.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060724033026-8469839ffec08a7e
        parent: pqm at pqm.ubuntu.com-20060724022408-87f9120f8eea8cf8
        parent: robertc at robertcollins.net-20060724032853-39d9a8a238c105e3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2006-07-24 13:30:26 +1000
        message:
          (robertc) Deprecated EmptyTree in favour of Repository.revision_tree.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060724032853-39d9a8a238c105e3
        parent: robertc at robertcollins.net-20060724021523-b58eda7a64581152
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: remove-EmptyTree.
        timestamp: Mon 2006-07-24 13:28:53 +1000
        message:
          Fix test suite deprecation warnings from use of EmptyTtree.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060724021523-b58eda7a64581152
        parent: robertc at robertcollins.net-20060721014053-696a897cd34e214c
        parent: robertc at robertcollins.net-20060724021035-9c30a3a14bc5ac9d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: remove-EmptyTree.
        timestamp: Mon 2006-07-24 12:15:23 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060721014053-696a897cd34e214c
        parent: robertc at robertcollins.net-20060720140113-ad5e1f8acd3a857f
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: remove-EmptyTree.
        timestamp: Fri 2006-07-21 11:40:53 +1000
        message:
          Remove the now obsolete test_emptytree.py test script.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060720140113-ad5e1f8acd3a857f
        parent: robertc at robertcollins.net-20060717061459-f5e26c59c03c6507
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: remove-EmptyTree.
        timestamp: Fri 2006-07-21 00:01:13 +1000
        message:
          Deprecate EmptyTree in favour of using Repository.revision_tree.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060724022408-87f9120f8eea8cf8
    parent: pqm at pqm.ubuntu.com-20060721204057-72782688d86e6cf1
    parent: robertc at robertcollins.net-20060724021035-9c30a3a14bc5ac9d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-24 03:24:08 +0100
    message:
      (robertc) Refactor workingtree lock tests to use the public interface only.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060724021035-9c30a3a14bc5ac9d
        parent: pqm at pqm.ubuntu.com-20060721204057-72782688d86e6cf1
        parent: robertc at robertcollins.net-20060724020758-22705e712fcbfc4a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2006-07-24 12:10:35 +1000
        message:
          (robertc) Refactor workingtree lock tests to use the public interface only.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060724020758-22705e712fcbfc4a
        parent: robertc at robertcollins.net-20060723000528-ba86950535c1ecdd
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree-unlock-tests
        timestamp: Mon 2006-07-24 12:07:58 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060723000528-ba86950535c1ecdd
        parent: robertc at robertcollins.net-20060717061459-f5e26c59c03c6507
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree-unlock-tests
        timestamp: Sun 2006-07-23 10:05:28 +1000
        message:
          Change bare except in working tree locking tests to catch LockError only.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060717061459-f5e26c59c03c6507
        parent: robertc at robertcollins.net-20060715141207-6c9993b94de78466
        parent: pqm at pqm.ubuntu.com-20060717051315-a684fdb1a42cd989
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree-unlock-tests
        timestamp: Mon 2006-07-17 16:14:59 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060715141207-6c9993b94de78466
        parent: robertc at robertcollins.net-20060714051512-a7cb4146aacfc563
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree-unlock-tests
        timestamp: Sun 2006-07-16 00:12:07 +1000
        message:
          Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714051512-a7cb4146aacfc563
        parent: robertc at robertcollins.net-20060714050508-ac44f7b9fb4a0273
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree-unlock-tests
        timestamp: Fri 2006-07-14 15:15:12 +1000
        message:
          Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714050508-ac44f7b9fb4a0273
        parent: robertc at robertcollins.net-20060714042710-86dc0cbaeaf4ea24
        parent: robertc at robertcollins.net-20060714050254-9db2372cc5a7237b
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree-unlock-tests
        timestamp: Fri 2006-07-14 15:05:08 +1000
        message:
          Pull in misc cleanups.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060721204057-72782688d86e6cf1
    parent: pqm at pqm.ubuntu.com-20060721054643-20c103c916447e25
    parent: john at arbash-meinel.com-20060721203204-5a6207700efd89c9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-07-21 21:40:57 +0100
    message:
      (jam) minor doc update to close bug #31276
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721203204-5a6207700efd89c9
        parent: john at arbash-meinel.com-20060721132827-99e1f65bd7925415
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-07-21 15:32:04 -0500
        message:
          Fix the docstring of RevisionSpec_date (bug #31276)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721132827-99e1f65bd7925415
        parent: john at arbash-meinel.com-20060713122019-5abfa50a415bbd60
        parent: pqm at pqm.ubuntu.com-20060721054643-20c103c916447e25
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-07-21 08:28:27 -0500
        message:
          [merge] bzr.dev 1878
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060721054643-20c103c916447e25
    parent: pqm at pqm.ubuntu.com-20060721041042-03dad3286bcc99ed
    parent: mbp at sourcefrog.net-20060721032812-7bbe9ea3b3f4dd14
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-07-21 06:46:43 +0100
    message:
      handle ^c in getpass()
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060721032812-7bbe9ea3b3f4dd14
        parent: pqm at pqm.ubuntu.com-20060720193054-cff67111d7eca9b9
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.interrupt
        timestamp: Fri 2006-07-21 13:28:12 +1000
        message:
          Avoid absorbing KeyboardInterrupt in getpass
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060721041042-03dad3286bcc99ed
    parent: pqm at pqm.ubuntu.com-20060721033753-193c788f37dd5004
    parent: john at arbash-meinel.com-20060721040214-9db86450785a5c3e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-07-21 05:10:42 +0100
    message:
      (jam) add bzrlib.ignores.add_runtime_ignores, for plugins that want to use it.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060721040214-9db86450785a5c3e
        parent: john at arbash-meinel.com-20060720221438-f91ad8cc36e0b576
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Thu 2006-07-20 23:02:14 -0500
        message:
          Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060720221438-f91ad8cc36e0b576
        parent: john at arbash-meinel.com-20060720215254-c49a69561acd1355
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Thu 2006-07-20 17:14:38 -0500
        message:
          Change ignore functions to use sets instead of lists.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060720215254-c49a69561acd1355
        parent: john at arbash-meinel.com-20060720215121-2e15a8db5ad5fac4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Thu 2006-07-20 16:52:54 -0500
        message:
          Update NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060720215121-2e15a8db5ad5fac4
        parent: john at arbash-meinel.com-20060720205406-531584e89226b8a7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Thu 2006-07-20 16:51:21 -0500
        message:
          Add a function for adding runtime ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060720205406-531584e89226b8a7
        parent: john at arbash-meinel.com-20060719203933-0fc9037bdb449761
        parent: pqm at pqm.ubuntu.com-20060720193054-cff67111d7eca9b9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Thu 2006-07-20 15:54:06 -0500
        message:
          [merge] bzr.dev 1875
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060721033753-193c788f37dd5004
    parent: pqm at pqm.ubuntu.com-20060720193054-cff67111d7eca9b9
    parent: mbp at sourcefrog.net-20060721031358-17d867783d7738b3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-07-21 04:37:53 +0100
    message:
      (metze) add bzr up as synonym for update
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060721031358-17d867783d7738b3
        parent: pqm at pqm.ubuntu.com-20060720060622-ffdccffd9cbb9f50
        parent: metze at samba.org-20060720102651-0ce2bdcbb073c97f
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.update
        timestamp: Fri 2006-07-21 13:13:58 +1000
        message:
          Add 'bzr up' as synonym for update
        ------------------------------------------------------------
        merged: metze at samba.org-20060720102651-0ce2bdcbb073c97f
        parent: metze at samba.org-20060720102135-4ba29ab3b3eb3068
        committer: Stefan (metze) Metzmacher <metze at samba.org>
        branch nick: bzr.mx
        timestamp: Thu 2006-07-20 12:26:51 +0200
        message:
          add simple test for 'bzr up'
          
          metze
        ------------------------------------------------------------
        merged: metze at samba.org-20060720102135-4ba29ab3b3eb3068
        parent: metze at samba.org-20060717212413-e147980eae7606fc
        parent: pqm at pqm.ubuntu.com-20060720060622-ffdccffd9cbb9f50
        committer: Stefan (metze) Metzmacher <metze at samba.org>
        branch nick: bzr.mx
        timestamp: Thu 2006-07-20 12:21:35 +0200
        message:
          merge in bzr.dev
        ------------------------------------------------------------
        merged: metze at samba.org-20060717212413-e147980eae7606fc
        parent: metze at samba.org-20060627053308-38ef7488a89fa3f0
        parent: pqm at pqm.ubuntu.com-20060717190245-d1e1afe2954418a3
        committer: Stefan (metze) Metzmacher <metze at samba.org>
        branch nick: bzr.mx
        timestamp: Mon 2006-07-17 23:24:13 +0200
        message:
          merge in bzr.dev
        ------------------------------------------------------------
        merged: metze at samba.org-20060627053308-38ef7488a89fa3f0
        parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
        committer: Stefan (metze) Metzmacher <metze at samba.org>
        branch nick: bzr.mx
        timestamp: Tue 2006-06-27 07:33:08 +0200
        message:
          add 'up' as alias for 'update'
          
          metze
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060720193054-cff67111d7eca9b9
    parent: pqm at pqm.ubuntu.com-20060720142115-2c94a67bd5a5205c
    parent: john at arbash-meinel.com-20060720175818-b973d54278a39ef7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-20 20:30:54 +0100
    message:
      (jam) squash file ids to make them friendlier to limited filesystems (bug #43801)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060720175818-b973d54278a39ef7
        parent: john at arbash-meinel.com-20060718154117-29600c9d3f23c59f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: smaller-file-ids
        timestamp: Thu 2006-07-20 12:58:18 -0500
        message:
          Update the tests to verify the length of the file id, as suggested by mbp
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060718154117-29600c9d3f23c59f
        parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: smaller-file-ids
        timestamp: Tue 2006-07-18 10:41:17 -0500
        message:
          Fix bug #43801 by squashing file ids a little bit more.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060720142115-2c94a67bd5a5205c
    parent: pqm at pqm.ubuntu.com-20060720060622-ffdccffd9cbb9f50
    parent: jaq at spacepants.org-20060718235952-1e362401a7858958
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-20 15:21:15 +0100
    message:
      (jaq) add a test that revision entries can be idempotently created
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060718235952-1e362401a7858958
        parent: jaq at spacepants.org-20060522032750-cc83c7702e8a8bd6
        parent: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Wed 2006-07-19 09:59:52 +1000
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060522032750-cc83c7702e8a8bd6
        parent: jaq at spacepants.org-20060511123637-e604b50cb9e5cba4
        parent: pqm at pqm.ubuntu.com-20060521233520-7f8a0248d93bde80
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Mon 2006-05-22 13:27:50 +1000
        message:
          merge from mainline
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060511123637-e604b50cb9e5cba4
        parent: jaq at spacepants.org-20060511015111-b687646f85317341
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Thu 2006-05-11 22:36:37 +1000
        message:
          doc: make error message make more sense
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060511015111-b687646f85317341
        parent: jaq at spacepants.org-20060420121922-e92211cac24fe8c7
        parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Thu 2006-05-11 11:51:11 +1000
        message:
          merge from mainline
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060420121922-e92211cac24fe8c7
        parent: jaq at spacepants.org-20060420021315-c2ed3c5cc5735f51
        parent: pqm at pqm.ubuntu.com-20060420074648-a9cefa72a3a9a5e8
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Thu 2006-04-20 22:19:22 +1000
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060420021315-c2ed3c5cc5735f51
        parent: jaq at spacepants.org-20060411063750-1d1babc66dcb247b
        parent: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Thu 2006-04-20 12:13:15 +1000
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060411063750-1d1babc66dcb247b
        parent: jaq at spacepants.org-20060330032326-a74da6fb3a2abe9f
        parent: pqm at pqm.ubuntu.com-20060410135440-f18f47545bf15172
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Tue 2006-04-11 16:37:50 +1000
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060330032326-a74da6fb3a2abe9f
        parent: jaq at spacepants.org-20060327125215-6b76189bbfacb3af
        parent: pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Thu 2006-03-30 14:23:26 +1100
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060327125215-6b76189bbfacb3af
        parent: jaq at spacepants.org-20060327124447-96b90762e112e280
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Mon 2006-03-27 23:52:15 +1100
        message:
          don't cast commit timestamp to long, which loses precision
        ------------------------------------------------------------
        merged: jaq at spacepants.org-20060327124447-96b90762e112e280
        parent: pqm at pqm.ubuntu.com-20060323202841-c460fdfe30972b21
        committer: Jamie Wilkinson <jaq at spacepants.org>
        branch nick: bzr.jaq
        timestamp: Mon 2006-03-27 23:44:47 +1100
        message:
          test that revision accessors act idempotently
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060720060622-ffdccffd9cbb9f50
    parent: pqm at pqm.ubuntu.com-20060720042258-1a688780079dbe99
    parent: robertc at robertcollins.net-20060720050408-8a40f60b685f140b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-20 07:06:22 +0100
    message:
      (robertc) Reduce code duplication in transport-parameterised tests.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060720050408-8a40f60b685f140b
        parent: robertc at robertcollins.net-20060720040458-81540e4c481c12d3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: selftest
        timestamp: Thu 2006-07-20 15:04:08 +1000
        message:
          Reduce code duplication in transport-parameterised tests.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060720042258-1a688780079dbe99
    parent: pqm at pqm.ubuntu.com-20060719214416-9fab2f627df9f1aa
    parent: robertc at robertcollins.net-20060720040458-81540e4c481c12d3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-20 05:22:58 +0100
    message:
      (robertc) Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060720040458-81540e4c481c12d3
        parent: pqm at pqm.ubuntu.com-20060719214416-9fab2f627df9f1aa
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Thu 2006-07-20 14:04:58 +1000
        message:
          Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060719214416-9fab2f627df9f1aa
    parent: pqm at pqm.ubuntu.com-20060719213607-f777696fc691064c
    parent: john at arbash-meinel.com-20060719203933-0fc9037bdb449761
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-19 22:44:16 +0100
    message:
      (jam) allow global user ignores, and include a small set by default
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060719203933-0fc9037bdb449761
        parent: john at arbash-meinel.com-20060719190156-11da95c8e2d987a5
        parent: pqm at pqm.ubuntu.com-20060719203238-892f369155dca5dc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-19 15:39:33 -0500
        message:
          [merge] bzr.dev 1869
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060719190156-11da95c8e2d987a5
        parent: john at arbash-meinel.com-20060713001248-59b78d76cb6cd8e0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-19 14:01:56 -0500
        message:
          cleanups suggested by Martin.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713001248-59b78d76cb6cd8e0
        parent: john at arbash-meinel.com-20060713000738-974459fa90527670
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 19:12:48 -0500
        message:
          remove the stub DEFAULT_IGNORE for just the deprecated list.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713000738-974459fa90527670
        parent: john at arbash-meinel.com-20060713000514-aa62627aa0d4deb6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 19:07:38 -0500
        message:
          Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713000514-aa62627aa0d4deb6
        parent: john at arbash-meinel.com-20060712235250-eea301eedffb7a11
        parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 19:05:14 -0500
        message:
          [merge] bzr.dev 1861
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712235250-eea301eedffb7a11
        parent: john at arbash-meinel.com-20060712234452-764f80cf21d61565
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 18:52:50 -0500
        message:
          Restore the ability to ignore items by modifying DEFAULT_IGNORE
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712234452-764f80cf21d61565
        parent: john at arbash-meinel.com-20060712233911-75bfbbdf732c0480
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 18:44:52 -0500
        message:
          Make sure that mixing global and local ignores work
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712233911-75bfbbdf732c0480
        parent: john at arbash-meinel.com-20060712233432-fd97116c76f4c8ba
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 18:39:11 -0500
        message:
          Update NEWS to explain the current situation for ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712233432-fd97116c76f4c8ba
        parent: john at arbash-meinel.com-20060712232221-59ff471807ac2927
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 18:34:32 -0500
        message:
          Cleaned up the last failing tests. All tests pass again.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712232221-59ff471807ac2927
        parent: john at arbash-meinel.com-20060712193216-6f57cb717d4d4677
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 18:22:21 -0500
        message:
          move 'bzr ls' tests into their own file, and fix them up.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712193216-6f57cb717d4d4677
        parent: john at arbash-meinel.com-20060712180501-1a638c0c5b1e7646
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 14:32:16 -0500
        message:
          Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712180501-1a638c0c5b1e7646
        parent: john at arbash-meinel.com-20060712173657-c79f05be9d74095b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 13:05:01 -0500
        message:
          Updated WorkingTree to use the new user-level ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712173657-c79f05be9d74095b
        parent: john at arbash-meinel.com-20060712172416-161dc0bd567a2682
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 12:36:57 -0500
        message:
          Adding a helper function that will only add patterns if they are missing.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712172416-161dc0bd567a2682
        parent: john at arbash-meinel.com-20060712162000-c8cfe629b012e0bb
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 12:24:16 -0500
        message:
          Adding functions for getting user ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712162000-c8cfe629b012e0bb
        parent: john at arbash-meinel.com-20060712143754-6ae813e12c8ab5d9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 11:20:00 -0500
        message:
          Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712143754-6ae813e12c8ab5d9
        parent: john at arbash-meinel.com-20060710165247-cc68c30ea42574dc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Wed 2006-07-12 09:37:54 -0500
        message:
          Removing setup-default-ignores per Martin's request
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710165247-cc68c30ea42574dc
        parent: john at arbash-meinel.com-20060710164849-6657190389d9e6c4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Mon 2006-07-10 11:52:47 -0500
        message:
          Make NEWS nicer for setup-default-ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710164849-6657190389d9e6c4
        parent: john at arbash-meinel.com-20060707203837-652b426cfd7856de
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Mon 2006-07-10 11:48:49 -0500
        message:
          Add global ignore information to the tutorial.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707203837-652b426cfd7856de
        parent: john at arbash-meinel.com-20060707203114-9a5bad72db418754
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Fri 2006-07-07 15:38:37 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707203114-9a5bad72db418754
        parent: john at arbash-meinel.com-20060707202948-835b9b7031034d04
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Fri 2006-07-07 15:31:14 -0500
        message:
          Added a setup-default-ignores, which lets us restore the old default ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707202948-835b9b7031034d04
        parent: john at arbash-meinel.com-20060707195626-9102f3d623083329
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Fri 2006-07-07 15:29:48 -0500
        message:
          Creating a helper function for getting the user ignore filename
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707195626-9102f3d623083329
        parent: john at arbash-meinel.com-20060707193953-0b5deaea49f21a9f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Fri 2006-07-07 14:56:26 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707193953-0b5deaea49f21a9f
        parent: john at arbash-meinel.com-20060707160159-2e7b7360bc3bed82
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Fri 2006-07-07 14:39:53 -0500
        message:
          Cleanup is_ignored to handle comment lines, and a global ignore pattern
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707160159-2e7b7360bc3bed82
        parent: john at arbash-meinel.com-20060704140029-f7d23145ea05d75a
        parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: ignores
        timestamp: Fri 2006-07-07 11:01:59 -0500
        message:
          [merge] 1843
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060719213607-f777696fc691064c
    parent: pqm at pqm.ubuntu.com-20060719203238-892f369155dca5dc
    parent: john at arbash-meinel.com-20060714161517-ce6e74d825379415
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-19 22:36:07 +0100
    message:
      (jam) print failed tests as you go (in non verbose mode)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714161517-ce6e74d825379415
        parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: small-test-updates
        timestamp: Fri 2006-07-14 11:15:17 -0500
        message:
          Print out when a test fails in non verbose mode, run transport tests later
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060719203238-892f369155dca5dc
    parent: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
    parent: john at arbash-meinel.com-20060719180226-ce7d12331fedbb70
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-19 21:32:38 +0100
    message:
      (jam, mpee, jrydberg) update http with keep-alive and multi-range requests. http operations 2-4x faster
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060719180226-ce7d12331fedbb70
        parent: john at arbash-meinel.com-20060719141749-5c8a2a433f966f29
        parent: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Wed 2006-07-19 13:02:26 -0500
        message:
          [merge] bzr.dev 1868, cleanup NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060719141749-5c8a2a433f966f29
        parent: john at arbash-meinel.com-20060718205753-900cc77474088d2b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Wed 2006-07-19 09:17:49 -0500
        message:
          Update _extract_headers, make it less generic, and non recursive.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060718205753-900cc77474088d2b
        parent: john at arbash-meinel.com-20060718202750-0ecae2405c7a7b55
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Tue 2006-07-18 15:57:53 -0500
        message:
          parse redirect headers properly.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060718202750-0ecae2405c7a7b55
        parent: john at arbash-meinel.com-20060714192524-4396095e5dd43417
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Tue 2006-07-18 15:27:50 -0500
        message:
          code cleanups from Martin Pool.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714192524-4396095e5dd43417
        parent: john at arbash-meinel.com-20060714045829-5aeeed36f35603c1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Fri 2006-07-14 14:25:24 -0500
        message:
          Remove the ability to read negative offsets from readv()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714045829-5aeeed36f35603c1
        parent: john at arbash-meinel.com-20060714030220-1c9d1e0d18cdb629
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 23:58:29 -0500
        message:
          small bug found by mpee
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714030220-1c9d1e0d18cdb629
        parent: john at arbash-meinel.com-20060714022338-ff35af6b8d04e9a6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 22:02:20 -0500
        message:
          pycurl expects us to just set the range of bytes, not including bytes=
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714022338-ff35af6b8d04e9a6
        parent: john at arbash-meinel.com-20060714014636-f60fd83545520ba6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 21:23:38 -0500
        message:
          pycurl expects us to just set the range of bytes, not including bytes=
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714014636-f60fd83545520ba6
        parent: john at arbash-meinel.com-20060714003508-ddc3b6f0f7ad509c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 20:46:36 -0500
        message:
          For pycurl inverse of (NOBODY,1) is (HTTPGET,1) not (NOBODY,0)
          
          added the pycurl error codes from curl/curl.h
          updated NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714003508-ddc3b6f0f7ad509c
        parent: john at arbash-meinel.com-20060713204221-1e69c237999296f8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 19:35:08 -0500
        message:
          shorten the readv message to cause a smaller debug log.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713204221-1e69c237999296f8
        parent: john at arbash-meinel.com-20060713195822-965e2c4422506a75
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 15:42:21 -0500
        message:
          Cleanup pass #2
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713195822-965e2c4422506a75
        parent: john at arbash-meinel.com-20060713184334-a8a8c873459b4200
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 14:58:22 -0500
        message:
          cleanup pass, allow pycurl connections to be shared between transports.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713184334-a8a8c873459b4200
        parent: john at arbash-meinel.com-20060713183858-ebf4aa1f9ef8bb6e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 13:43:34 -0500
        message:
          Update http errors to properly use BzrNewError
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713183858-ebf4aa1f9ef8bb6e
        parent: john at arbash-meinel.com-20060713183512-c520ddfbbdde3fef
        parent: pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 13:38:58 -0500
        message:
          [merge] bzr.dev 1863
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713183512-c520ddfbbdde3fef
        parent: john at arbash-meinel.com-20060713183332-8bc576e3eb31efd6
        parent: michael at ellerman.id.au-20060704070457-69d44bec57cc8d44
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 13:35:12 -0500
        message:
          [merge] mpee's http work. Merged the spirit, if not the actual code.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060704070457-69d44bec57cc8d44
            parent: michael at ellerman.id.au-20060704070301-eeb87f3378c742be
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-07-04 17:04:57 +1000
            message:
              Raise HttpError if we get a code we don't understand.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060704070301-eeb87f3378c742be
            parent: michael at ellerman.id.au-20060704070158-e6dd9855fcb2bb37
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-07-04 17:03:01 +1000
            message:
              Be more careful when grabbing Content-Range header.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060704070158-e6dd9855fcb2bb37
            parent: michael at ellerman.id.au-20060704070020-6559fbfcc063de43
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-07-04 17:01:58 +1000
            message:
              Be more careful when grabbing Content-Type header.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060704070020-6559fbfcc063de43
            parent: michael at ellerman.id.au-20060627081952-4250a017ffad77f0
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-07-04 17:00:20 +1000
            message:
              Add HttpError to help diagnosing HTTP problems.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060627081952-4250a017ffad77f0
            parent: michael at ellerman.id.au-20060627081935-2aa506a26a646ad4
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-06-27 18:19:52 +1000
            message:
              Don't import errno twice, thanks to pychecker.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060627081935-2aa506a26a646ad4
            parent: michael at ellerman.id.au-20060627081525-b62b0b1b3ea7651c
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-06-27 18:19:35 +1000
            message:
              Raise TransportError() if we get a response code we don't understand.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060627081525-b62b0b1b3ea7651c
            parent: michael at ellerman.id.au-20060627081245-93aa836b60253097
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-06-27 18:15:25 +1000
            message:
              Tests for HTTP multipart helpers.
              
              Make HttpTransportBase.(offsets_to_ranges|range_header) static, and add
              some tests for both.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060627081245-93aa836b60253097
            parent: michael at ellerman.id.au-20060627071453-14db5ba9988f6c8c
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-06-27 18:12:45 +1000
            message:
              Don't send extra spaces in the HTTP Range header, it's just more I/O.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060627071453-14db5ba9988f6c8c
            parent: michael at ellerman.id.au-20060621052521-dad2db9cd4956194
            parent: john at arbash-meinel.com-20060617162214-9043c7594a3ad90d
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Tue 2006-06-27 17:14:53 +1000
            message:
              Merge John's HTTP work.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060621052521-dad2db9cd4956194
            parent: michael at ellerman.id.au-20060616083821-97e9a43fd7566821
            parent: pqm at pqm.ubuntu.com-20060620063849-400861427a3a9ff1
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Wed 2006-06-21 15:25:21 +1000
            message:
              Merge trunk.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713183332-8bc576e3eb31efd6
        parent: john at arbash-meinel.com-20060713182621-10fc8ce282741455
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 13:33:32 -0500
        message:
          Update and add tests for the HttpTransportBase.range_header
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713182621-10fc8ce282741455
        parent: john at arbash-meinel.com-20060713173135-451d2f4f5c6c8909
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 13:26:21 -0500
        message:
          Fix up the http transports so that tests pass with the new configuration.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713173135-451d2f4f5c6c8909
        parent: john at arbash-meinel.com-20060713141256-caf2fbe04f23f3ce
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 12:31:35 -0500
        message:
          Update and test handle_response.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713141256-caf2fbe04f23f3ce
        parent: john at arbash-meinel.com-20060713134347-3e3fe280e0bd3ac9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 09:12:56 -0500
        message:
          Test that we can extract headers properly.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713134347-3e3fe280e0bd3ac9
        parent: john at arbash-meinel.com-20060713131106-4f059a8003d852bd
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 08:43:47 -0500
        message:
          Move the functions/regexes to be static members
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713131106-4f059a8003d852bd
        parent: john at arbash-meinel.com-20060713011110-9efcb64313b3143b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-13 08:11:06 -0500
        message:
          Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713011110-9efcb64313b3143b
        parent: john at arbash-meinel.com-20060711144459-40085c06b14494e0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Wed 2006-07-12 20:11:10 -0500
        message:
          Add Keep-Alive for 1.0 servers
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711144459-40085c06b14494e0
        parent: john at arbash-meinel.com-20060706202201-768652a601fbda8c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Tue 2006-07-11 09:44:59 -0500
        message:
          (broken) Work on factoring out handle_response so we can test with fake headers.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706202201-768652a601fbda8c
        parent: john at arbash-meinel.com-20060706201251-680da840bdf98200
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 15:22:01 -0500
        message:
          Added an exception check for HttpMulti
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706201251-680da840bdf98200
        parent: john at arbash-meinel.com-20060706195530-6d119290fa466736
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 15:12:51 -0500
        message:
          A couple of cleanup passes
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706195530-6d119290fa466736
        parent: john at arbash-meinel.com-20060706194549-8ab6408a2f4ff920
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 14:55:30 -0500
        message:
          Add tests for HttpMultiRangeResponse
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706194549-8ab6408a2f4ff920
        parent: john at arbash-meinel.com-20060706184711-94b439f5de6b30a2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 14:45:49 -0500
        message:
          Adding tests for _parse_boundary.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706184711-94b439f5de6b30a2
        parent: john at arbash-meinel.com-20060706184021-90352f45f0a79e49
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 13:47:11 -0500
        message:
          Refactor tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706184021-90352f45f0a79e49
        parent: john at arbash-meinel.com-20060706183533-641776c30da93b56
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 13:40:21 -0500
        message:
          Factor out _parse_range into a separate function for easier testing/better hierarchy.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706183533-641776c30da93b56
        parent: john at arbash-meinel.com-20060706182616-82f4555fe7613667
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 13:35:33 -0500
        message:
          Testing basic functionality of HttpMultipartRangeResponse
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706182616-82f4555fe7613667
        parent: john at arbash-meinel.com-20060706174851-2bcc983af9d978fa
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 13:26:16 -0500
        message:
          Found a few bugs in error handling code, updated tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706174851-2bcc983af9d978fa
        parent: john at arbash-meinel.com-20060706174621-b3d278556f7c860f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 12:48:51 -0500
        message:
          Add tests for ResponseRange and streamline class
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706174621-b3d278556f7c860f
        parent: john at arbash-meinel.com-20060706174556-70e9f8ee16fdd01a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 12:46:21 -0500
        message:
          _pycurl doesn't use extract_auth, don't import it
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706174556-70e9f8ee16fdd01a
        parent: john at arbash-meinel.com-20060706163003-aa969b1e9369b47f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 12:45:56 -0500
        message:
          Simplify test_osutils.py to avoid >80 char lines
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706163003-aa969b1e9369b47f
        parent: john at arbash-meinel.com-20060706162912-1680b115cdb24071
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 11:30:03 -0500
        message:
          Make tail_amount optional, so that has() still works.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706162912-1680b115cdb24071
        parent: john at arbash-meinel.com-20060705140746-5f3fd21c12c7d661
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Thu 2006-07-06 11:29:12 -0500
        message:
          [merge] Johan Rydberg test updates
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060705140746-5f3fd21c12c7d661
        parent: john at arbash-meinel.com-20060617162214-9043c7594a3ad90d
        parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Wed 2006-07-05 09:07:46 -0500
        message:
          [merge] bzr.dev 
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617162214-9043c7594a3ad90d
        parent: john at arbash-meinel.com-20060617155251-c445c9574fcdf6aa
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Sat 2006-06-17 11:22:14 -0500
        message:
          Missed a couple of imports
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617155251-c445c9574fcdf6aa
        parent: john at arbash-meinel.com-20060617152019-b5366fa382aca78c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Sat 2006-06-17 10:52:51 -0500
        message:
          Move the common Multipart stuff into plain http, and wrap pycurl response so that it matches the urllib response object.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617152019-b5366fa382aca78c
        parent: john at arbash-meinel.com-20060617131706-98a8e24de239a0d4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Sat 2006-06-17 10:20:19 -0500
        message:
          Adding HEADERFUNCTION which lets us get any response codes we want.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617131706-98a8e24de239a0d4
        parent: john at arbash-meinel.com-20060617131218-7f812f5d62a47086
        parent: michael at ellerman.id.au-20060616083821-97e9a43fd7566821
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Sat 2006-06-17 08:17:06 -0500
        message:
          [merge] Michael Ellerman: Support HTTP multipart ranges in urllib.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060616083821-97e9a43fd7566821
            parent: michael at ellerman.id.au-20060608162722-df63ead19775ce65
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Fri 2006-06-16 18:38:21 +1000
            message:
              Add support for HTTP multipart ranges and hook it into http+urllib.
            ------------------------------------------------------------
            merged: michael at ellerman.id.au-20060608162722-df63ead19775ce65
            parent: pqm at pqm.ubuntu.com-20060607170142-7d3d91a14bbccd3f
            committer: Michael Ellerman <michael at ellerman.id.au>
            branch nick: http
            timestamp: Fri 2006-06-09 02:27:22 +1000
            message:
              Don't coallesce try blocks, it can lead to confusing exceptions.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617131218-7f812f5d62a47086
        parent: john at arbash-meinel.com-20060617122817-2a0a1c84eb9c459c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Sat 2006-06-17 08:12:18 -0500
        message:
          Use 2 pycurl objects because of RANGE peculiarities.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617122817-2a0a1c84eb9c459c
        parent: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: http
        timestamp: Sat 2006-06-17 07:28:17 -0500
        message:
          Re-use the curl object for a plain _get request
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
    parent: pqm at pqm.ubuntu.com-20060717190245-d1e1afe2954418a3
    parent: john at arbash-meinel.com-20060718185754-4007745748e28db9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-18 21:24:56 +0100
    message:
      (jam) set timestamp resolution as 1ms
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060718185754-4007745748e28db9
        parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: one-ms-timestamp
        timestamp: Tue 2006-07-18 13:57:54 -0500
        message:
          Commit timestamp restricted to 1ms precision.
          
          The old code would restrict to 1s resolution if the timestamp was
          supplied, while it preserved full resolution if the timestamp was
          auto generated. Now both paths preserve only 1ms resolution.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060717190245-d1e1afe2954418a3
    parent: pqm at pqm.ubuntu.com-20060717051315-a684fdb1a42cd989
    parent: larstiq at larstiq.dyndns.org-20060713203001-82f7488cfc8cff5f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-17 20:02:45 +0100
    message:
      (larstiq) allow 'bzr init' on remote locations
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060713203001-82f7488cfc8cff5f
        parent: larstiq at larstiq.dyndns.org-20060713195925-84e5f2407c42b225
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Thu 2006-07-13 22:30:01 +0200
        message:
          clean up imports (and get if collapsing right)
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060713195925-84e5f2407c42b225
        parent: larstiq at larstiq.dyndns.org-20060713181800-4e8c4f9326597d7f
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Thu 2006-07-13 21:59:25 +0200
        message:
          review fixes, rename transport variable to to_transport
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060713181800-4e8c4f9326597d7f
        parent: larstiq at larstiq.dyndns.org-20060708135701-2287cf5609d52f94
        parent: pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Thu 2006-07-13 20:18:00 +0200
        message:
          [merge] bzr.dev 1863
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060708135701-2287cf5609d52f94
        parent: larstiq at larstiq.dyndns.org-20060702164837-f605fe8406da8038
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Sat 2006-07-08 15:57:01 +0200
        message:
          cleanup
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060702164837-f605fe8406da8038
        parent: larstiq at larstiq.dyndns.org-20060702161805-25638faa09cd04bd
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Sun 2006-07-02 18:48:37 +0200
        message:
          more review comments
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060702161805-25638faa09cd04bd
        parent: larstiq at larstiq.dyndns.org-20060702160708-e3a6a0e9adff50d0
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Sun 2006-07-02 18:18:05 +0200
        message:
          more review comments
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060702160708-e3a6a0e9adff50d0
        parent: larstiq at larstiq.dyndns.org-20060702154600-848abd3894fadfc1
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Sun 2006-07-02 18:07:08 +0200
        message:
          move function local imports of get_transport to the top
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060702154600-848abd3894fadfc1
        parent: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: remote-init
        timestamp: Sun 2006-07-02 17:46:00 +0200
        message:
          Allow bzr init to create remote branches
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060717051315-a684fdb1a42cd989
    parent: pqm at pqm.ubuntu.com-20060715153115-59f1601f31ecc38f
    parent: robertc at robertcollins.net-20060717045956-babe6f8c4193cb40
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-17 06:13:15 +0100
    message:
      (robertc) Some trivial cleanups to workingtree.py
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060717045956-babe6f8c4193cb40
        parent: pqm at pqm.ubuntu.com-20060715153115-59f1601f31ecc38f
        parent: robertc at robertcollins.net-20060717045806-fa089567dbcdb479
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2006-07-17 14:59:56 +1000
        message:
          (robertc) Some trivial cleanups to workingtree.py
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060717045806-fa089567dbcdb479
        parent: robertc at robertcollins.net-20060717045353-0af2b11e7b0b033c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Cleanup workingtree.
        timestamp: Mon 2006-07-17 14:58:06 +1000
        message:
          Adjust working tree cleanups as per review comments.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060717045353-0af2b11e7b0b033c
        parent: robertc at robertcollins.net-20060714050254-9db2372cc5a7237b
        parent: robertc at robertcollins.net-20060715143317-e21c6ee840c74d41
        parent: pqm at pqm.ubuntu.com-20060715153115-59f1601f31ecc38f
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Cleanup workingtree.
        timestamp: Mon 2006-07-17 14:53:53 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714050254-9db2372cc5a7237b
        parent: robertc at robertcollins.net-20060714042710-86dc0cbaeaf4ea24
        parent: robertc at robertcollins.net-20060714050237-5890683add8b2d57
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Cleanup workingtree.
        timestamp: Fri 2006-07-14 15:02:54 +1000
        message:
          Merge in new cleanups thread.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714042710-86dc0cbaeaf4ea24
        parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Cleanup workingtree.
        timestamp: Fri 2006-07-14 14:27:10 +1000
        message:
          Trivial cleanups to workingtree.py
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060715153115-59f1601f31ecc38f
    parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
    parent: robertc at robertcollins.net-20060715143317-e21c6ee840c74d41
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-07-15 16:31:15 +0100
    message:
      (robertc) Merge general - status tests, removal of unneeded imports, whitespace.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060715143317-e21c6ee840c74d41
        parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
        parent: robertc at robertcollins.net-20060715142903-1ef803f4af9aabc8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sun 2006-07-16 00:33:17 +1000
        message:
          (robertc) Merge general - status tests, removal of unneeded imports, whitespace.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060715142903-1ef803f4af9aabc8
        parent: robertc at robertcollins.net-20060714050237-5890683add8b2d57
        parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Misc cleanups.
        timestamp: Sun 2006-07-16 00:29:03 +1000
        message:
          Integrate bzr.dev.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060714050237-5890683add8b2d57
        parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Misc cleanups.
        timestamp: Fri 2006-07-14 15:02:37 +1000
        message:
          General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
    parent: pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
    parent: john at arbash-meinel.com-20060713191003-a93320c430ca563a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-13 20:18:49 +0100
    message:
      (jam) bug #49182, bundle reader should allow extra text
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713191003-a93320c430ca563a
        parent: john at arbash-meinel.com-20060711162634-f92a535d5024a703
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-07-13 14:10:03 -0500
        message:
          Update NEWS for fix of bug #49182
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711162634-f92a535d5024a703
        parent: john at arbash-meinel.com-20060711162049-47f590d8ebcb00a3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Tue 2006-07-11 11:26:34 -0500
        message:
          Add tests to ensure that we gracefully handle opening and trailing non-bundle text.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711162049-47f590d8ebcb00a3
        parent: john at arbash-meinel.com-20060711160325-871bac4ea99a2f52
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Tue 2006-07-11 11:20:49 -0500
        message:
          Raise the right errors
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711160325-871bac4ea99a2f52
        parent: john at arbash-meinel.com-20060710235051-1b84cec91844d4f8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Tue 2006-07-11 11:03:25 -0500
        message:
          Actually fix the bug with missing trailing newline bug #49182
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060713133754-64c134fffd39fd99
    parent: pqm at pqm.ubuntu.com-20060713133105-7c8e508aaa4886e2
    parent: john at arbash-meinel.com-20060713122432-f66fd0000dabb58e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-13 14:37:54 +0100
    message:
      (jam) update uncommit (bugs: #32526, #31426)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713122432-f66fd0000dabb58e
        parent: john at arbash-meinel.com-20060711210940-248917f611b6a2e5
        parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: uncommit-31426
        timestamp: Thu 2006-07-13 07:24:32 -0500
        message:
          [merge] bzr.dev 1861
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711210940-248917f611b6a2e5
        parent: john at arbash-meinel.com-20060711205328-405ab56e2638bd37
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: uncommit-31426
        timestamp: Tue 2006-07-11 16:09:40 -0500
        message:
          Fix bug 31426, have uncommit keep track of pending merges.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711205328-405ab56e2638bd37
        parent: john at arbash-meinel.com-20060711204704-228c6748c0d56183
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: uncommit-31426
        timestamp: Tue 2006-07-11 15:53:28 -0500
        message:
          Add copyright to test_uncommit.py
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711204704-228c6748c0d56183
        parent: john at arbash-meinel.com-20060711204532-42dfc1f487d2a2b0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: uncommit-32526
        timestamp: Tue 2006-07-11 15:47:04 -0500
        message:
          NEWS fix bug #32526
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711204532-42dfc1f487d2a2b0
        parent: john at arbash-meinel.com-20060711202757-ea7d1917f7282aad
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: uncommit-32526
        timestamp: Tue 2006-07-11 15:45:32 -0500
        message:
          Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711202757-ea7d1917f7282aad
        parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: uncommit-32526
        timestamp: Tue 2006-07-11 15:27:57 -0500
        message:
          cleanup the uncommit tests
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060713133105-7c8e508aaa4886e2
    parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
    parent: john at arbash-meinel.com-20060713122019-5abfa50a415bbd60
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-13 14:31:05 +0100
    message:
      (Adeodato Simó) use terminal_width() for status pending merges
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713122019-5abfa50a415bbd60
        parent: john at arbash-meinel.com-20060713121939-4c76f91190e4cd5d
        parent: dato at net.com.org.es-20060713002534-0f6001589ff30c28
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-07-13 07:20:19 -0500
        message:
          [merge] Adeodato Simó: use terminal_width() for status
            ------------------------------------------------------------
            merged: dato at net.com.org.es-20060713002534-0f6001589ff30c28
            parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
            committer: Adeodato Simó <dato at net.com.org.es>
            branch nick: bzr.dev.columns
            timestamp: Thu 2006-07-13 02:25:34 +0200
            message:
              Really use terminal_width() for pending-merge display. r1707 mentioned
              this in NEWS, but did not include that part of the fix.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060713121939-4c76f91190e4cd5d
        parent: john at arbash-meinel.com-20060712024948-162ebe6b4b9985bf
        parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-07-13 07:19:39 -0500
        message:
          [merge] bzr.dev 1861
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
    parent: pqm at pqm.ubuntu.com-20060712152038-043e16bab49a5b50
    parent: robey at lag.net-20060712162939-7d27143c632e3b3a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 22:53:00 +0100
    message:
      (robey) 'bzr whoami address' gives a warning if missing email address
        ------------------------------------------------------------
        merged: robey at lag.net-20060712162939-7d27143c632e3b3a
        parent: robey at lag.net-20060712153024-84f85a11780a17df
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Wed 2006-07-12 09:29:39 -0700
        message:
          change the warning message for a 'whoami' with no email address, on jam's recommendation
        ------------------------------------------------------------
        merged: robey at lag.net-20060712153024-84f85a11780a17df
        parent: robey at lag.net-20060712022544-b69c882708d0e5aa
        parent: pqm at pqm.ubuntu.com-20060712152038-043e16bab49a5b50
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Wed 2006-07-12 08:30:24 -0700
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: robey at lag.net-20060712022544-b69c882708d0e5aa
        parent: robey at lag.net-20060706071226-2d4bf403e7a12d2b
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Tue 2006-07-11 19:25:44 -0700
        message:
          fix some 80col wrapping and add a blackbox test to verify that a warning is displayed when a non-email identity is set
        ------------------------------------------------------------
        merged: robey at lag.net-20060706071226-2d4bf403e7a12d2b
        parent: robey at lag.net-20060704215714-89de58e3fc608ddd
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-07-06 00:12:26 -0700
        message:
          instead of raising an error, just display an exception if 'whoami' is given a name that doesn't look like it contains an email address
        ------------------------------------------------------------
        merged: robey at lag.net-20060704215714-89de58e3fc608ddd
        parent: pqm at pqm.ubuntu.com-20060704173203-6de4c6bbbe1a6149
        parent: pqm at pqm.ubuntu.com-20060704173203-6de4c6bbbe1a6149
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Tue 2006-07-04 14:57:14 -0700
        message:
          raise an exception if 'whoami' is given a name without a decodable email address
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712152038-043e16bab49a5b50
    parent: pqm at pqm.ubuntu.com-20060712151359-b22a8c043fa52eb7
    parent: john at arbash-meinel.com-20060712142406-d61dbe10e698517d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 16:20:38 +0100
    message:
      (jam) smart-add should recurse all supplied directories (bug #52578)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712142406-d61dbe10e698517d
        parent: john at arbash-meinel.com-20060711171214-7e2afe43bdc11433
        parent: pqm at pqm.ubuntu.com-20060712135614-506cabdbbc31e947
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix-add
        timestamp: Wed 2006-07-12 09:24:06 -0500
        message:
          [merge] bzr.dev 1858
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711171214-7e2afe43bdc11433
        parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix-add
        timestamp: Tue 2006-07-11 12:12:14 -0500
        message:
          Fix bug #52578, smart-add wasn't recursing all supplied directories.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712151359-b22a8c043fa52eb7
    parent: pqm at pqm.ubuntu.com-20060712135614-506cabdbbc31e947
    parent: john at arbash-meinel.com-20060712123152-6654ee91c947f4c9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 16:13:59 +0100
    message:
      (jam) update help text for diff (bug #6391)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712123152-6654ee91c947f4c9
        parent: john at arbash-meinel.com-20060711200412-380ba7847fb3749d
        parent: pqm at pqm.ubuntu.com-20060712100927-6af9cbe9c9e6af3b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: diff-6391
        timestamp: Wed 2006-07-12 07:31:52 -0500
        message:
          [merge] bzr.dev 1856
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711200412-380ba7847fb3749d
        parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: diff-6391
        timestamp: Tue 2006-07-11 15:04:12 -0500
        message:
          Annotate the diff examples to explain what they do
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712135614-506cabdbbc31e947
    parent: pqm at pqm.ubuntu.com-20060712123657-365eeb32b69308bf
    parent: abentley at panoramicfeedback.com-20060712124728-c59919a973eaa8bc
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 14:56:14 +0100
    message:
      commit respects filespec for removed files
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060712124728-c59919a973eaa8bc
        parent: abentley at panoramicfeedback.com-20060711150457-d4c96e9c60843973
        parent: pqm at pqm.ubuntu.com-20060712123657-365eeb32b69308bf
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-07-12 08:47:28 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060711150457-d4c96e9c60843973
        parent: abentley at panoramicfeedback.com-20060711131716-5ff677f3099e48b6
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2006-07-11 11:04:57 -0400
        message:
          Ensure commit respects file spec when committing removals
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060711131716-5ff677f3099e48b6
        parent: abentley at panoramicfeedback.com-20060706135122-3c6819dcd96886b7
        parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2006-07-11 09:17:16 -0400
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712123657-365eeb32b69308bf
    parent: pqm at pqm.ubuntu.com-20060712100927-6af9cbe9c9e6af3b
    parent: Matthieu.Moy at imag.fr-20060712102544-ca1a45d43f34abf7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 13:36:57 +0100
    message:
      (matthieu) revno:x:url revision spec
        ------------------------------------------------------------
        merged: Matthieu.Moy at imag.fr-20060712102544-ca1a45d43f34abf7
        parent: Matthieu.Moy at imag.fr-20060708203836-41c55eb497690906
        committer: Matthieu Moy <Matthieu.Moy at imag.fr>
        branch nick: bzr.revnoX
        timestamp: Wed 2006-07-12 15:55:44 +0530
        message:
          Added a NEWS entry.
        ------------------------------------------------------------
        merged: Matthieu.Moy at imag.fr-20060708203836-41c55eb497690906
        parent: Matthieu.Moy at imag.fr-20060708193230-3eb72d871471bd5b
        committer: Matthieu Moy <Matthieu.Moy at imag.fr>
        branch nick: bzr.revnoX
        timestamp: Sun 2006-07-09 02:08:36 +0530
        message:
          Testcases for revno:N:path
        ------------------------------------------------------------
        merged: Matthieu.Moy at imag.fr-20060708193230-3eb72d871471bd5b
        parent: Matthieu.Moy at imag.fr-20060605133754-1fc6081371fb3c11
        parent: pqm at pqm.ubuntu.com-20060708044058-a64fc46ea66545cb
        committer: Matthieu Moy <Matthieu.Moy at imag.fr>
        branch nick: bzr.revnoX
        timestamp: Sun 2006-07-09 01:02:30 +0530
        message:
          merge
        ------------------------------------------------------------
        merged: Matthieu.Moy at imag.fr-20060605133754-1fc6081371fb3c11
        parent: pqm at pqm.ubuntu.com-20060525225841-625f0ece2f64af43
        committer: Matthieu Moy <Matthieu.Moy at imag.fr>
        branch nick: bzr.revnoX
        timestamp: Mon 2006-06-05 19:07:54 +0530
        message:
          Implementation of -r revno:N:/path/to/branch
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712100927-6af9cbe9c9e6af3b
    parent: pqm at pqm.ubuntu.com-20060712032241-2352b3ef35093aa1
    parent: mbp at sourcefrog.net-20060712052248-789ab09214cf9fef
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 11:09:27 +0100
    message:
      (mbp) hashcache fixes
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060712052248-789ab09214cf9fef
        parent: mbp at sourcefrog.net-20060709062838-e0482875c25a202f
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.hashcache
        timestamp: Wed 2006-07-12 15:22:48 +1000
        message:
                Improvements to hashcache testing:
                
                 - moves the functions that depend on the OS state into HashCache
                 - removes dead 'FixThisError' (??) from test_hashcache
                 - adds new FakeHashCache, which gives the test suite control of
                   how the files and clock appear to the hashcache
                 - new tests using this which check three key behaviours:
                   - new files are not inserted in the cache
                   - old files are inserted in the cache and can hit
                   - if a file is modified within a short time window, we don't get
                     an incorrect cached result
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060709062838-e0482875c25a202f
        parent: mbp at sourcefrog.net-20060709034316-fa45900c76d1df39
        committer: mbp at sourcefrog.net
        branch nick: bzr.mbp.hashcache
        timestamp: Sun 2006-07-09 07:28:38 +0100
        message:
          Use larger time window on hashcache to be safe with fractional times
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060709034316-fa45900c76d1df39
        parent: pqm at pqm.ubuntu.com-20060708044058-a64fc46ea66545cb
        committer: mbp at sourcefrog.net
        branch nick: bzr.mbp.hashcache
        timestamp: Sun 2006-07-09 03:43:16 +0000
        message:
          Refactor and improve hashcache tests
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712032241-2352b3ef35093aa1
    parent: pqm at pqm.ubuntu.com-20060712031607-3662d1acc5a6c28d
    parent: john at arbash-meinel.com-20060712024948-162ebe6b4b9985bf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 04:22:41 +0100
    message:
      (jam) minor cleanups, updates to NEWS for bug fixes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712024948-162ebe6b4b9985bf
        parent: john at arbash-meinel.com-20060712022725-81e49e7537b91f08
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 21:49:48 -0500
        message:
          Restore logging of full traceback. Helps with debugging tests.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712022725-81e49e7537b91f08
        parent: john at arbash-meinel.com-20060711151703-b7998b945efbfdb2
        parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 21:27:25 -0500
        message:
          merge bzr.dev, cleanup NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711151703-b7998b945efbfdb2
        parent: john at arbash-meinel.com-20060711150637-fcde274329795188
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 10:17:03 -0500
        message:
          Update NEWS for fixed bugs #50155, #41183, #42592
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711150637-fcde274329795188
        parent: john at arbash-meinel.com-20060711144700-597a978cebc404de
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 10:06:37 -0500
        message:
          NEWS bug #5444
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711144700-597a978cebc404de
        parent: john at arbash-meinel.com-20060711132429-1a2e959a5acb28b5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 09:47:00 -0500
        message:
          minor fix from Jan Balster to get --benchmark to work again
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711132429-1a2e959a5acb28b5
        parent: john at arbash-meinel.com-20060711132231-b250bd31162a8bea
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 08:24:29 -0500
        message:
          NEWS on bundle fix for bug #51927
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711132231-b250bd31162a8bea
        parent: john at arbash-meinel.com-20060706162414-d0668a8c42c10d09
        parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-11 08:22:31 -0500
        message:
          [merge] bzr.dev 1850
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706162414-d0668a8c42c10d09
        parent: john at arbash-meinel.com-20060706022726-769792485a0b6890
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-07-06 11:24:14 -0500
        message:
          Remove useless line from bzrlib/diff.py
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712031607-3662d1acc5a6c28d
    parent: pqm at pqm.ubuntu.com-20060712030941-2728644bf8185775
    parent: john at arbash-meinel.com-20060712024522-635f6de9df561c84
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 04:16:07 +0100
    message:
      (jam) allow progress bar to be set with BZR_PROGRESS_BAR
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712024522-635f6de9df561c84
        parent: john at arbash-meinel.com-20060712022047-bd0773a29c5e03c2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Tue 2006-07-11 21:45:22 -0500
        message:
          ui tests were failing when output was redirected to a file. (thus blocked by the pqm)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060712022047-bd0773a29c5e03c2
        parent: john at arbash-meinel.com-20060710233402-8cd35919e20b6fee
        parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Tue 2006-07-11 21:20:47 -0500
        message:
          merge bzr.dev, resolve NEWS conflict.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710233402-8cd35919e20b6fee
        parent: john at arbash-meinel.com-20060710230044-8bbfddd920940ffe
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Mon 2006-07-10 18:34:02 -0500
        message:
          NEWS, this fixes bugs (#42197, #51107)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710230044-8bbfddd920940ffe
        parent: john at arbash-meinel.com-20060710215056-167de5de0bee816a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Mon 2006-07-10 18:00:44 -0500
        message:
          new env var 'BZR_PROGRESS_BAR' to select the exact progress type
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710215056-167de5de0bee816a
        parent: john at arbash-meinel.com-20060710212455-13af54c421c4d806
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Mon 2006-07-10 16:50:56 -0500
        message:
          Cleanup tests by using a helper
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710212455-13af54c421c4d806
        parent: john at arbash-meinel.com-20060710210901-a1293e6bc6512699
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Mon 2006-07-10 16:24:55 -0500
        message:
          Add tests to assert we fall back to DotsProgressBar when appropriate.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710210901-a1293e6bc6512699
        parent: john at arbash-meinel.com-20060707143607-ba49f814db2e4426
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Mon 2006-07-10 16:09:01 -0500
        message:
          Remove get_eta's ability to modify last_updates.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707143607-ba49f814db2e4426
        parent: john at arbash-meinel.com-20060707143512-67c9442bd7f63158
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Fri 2006-07-07 09:36:07 -0500
        message:
          Don't let the last_updates list grow without bound.
          
          Switching to using a list instead of deque() because deque doesn't
          allow negative indexing. It was only used because get_eta() wanted
          to be able to modify the list in place, but we can do that with
          special slicing.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707143512-67c9442bd7f63158
        parent: john at arbash-meinel.com-20060707140412-885913e0509ce773
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Fri 2006-07-07 09:35:12 -0500
        message:
          Fix a ui test that depended on clearing
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707140412-885913e0509ce773
        parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-progress
        timestamp: Fri 2006-07-07 09:04:12 -0500
        message:
          Don't clear anything if nothing has been written.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060712030941-2728644bf8185775
    parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
    parent: john at arbash-meinel.com-20060711214611-f3135668ec22f813
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-12 04:09:41 +0100
    message:
      (jam) Allow a plain '-' to be supplied as an argument. bug #50984
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711214611-f3135668ec22f813
        parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dash-arg-50984
        timestamp: Tue 2006-07-11 16:46:11 -0500
        message:
          Allow a plain '-' to be supplied as an argument. bug #50984
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
    parent: pqm at pqm.ubuntu.com-20060711203906-910d9b22b82b219c
    parent: larstiq at larstiq.dyndns.org-20060711011417-67a3cc31542a448f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-11 21:45:42 +0100
    message:
      (larstiq) fix 'bzr mv' with no args, cleanup mv tests
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060711011417-67a3cc31542a448f
        parent: larstiq at larstiq.dyndns.org-20060709201249-91fa66f6001eb965
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.mv
        timestamp: Tue 2006-07-11 03:14:17 +0200
        message:
          test mv more rigorously
        ------------------------------------------------------------
        merged: larstiq at larstiq.dyndns.org-20060709201249-91fa66f6001eb965
        parent: pqm at pqm.ubuntu.com-20060709161745-764d41910ae59c5e
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.mv
        timestamp: Sun 2006-07-09 22:12:49 +0200
        message:
          Don't fail on 'bzr mv', extract move tests from OldTests.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060711203906-910d9b22b82b219c
    parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
    parent: john at arbash-meinel.com-20060711183409-b07f0978208e1a26
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-11 21:39:06 +0100
    message:
      (jam) support mac-normalization for unicode files.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711183409-b07f0978208e1a26
        parent: john at arbash-meinel.com-20060711150536-a0dcb33b1581c044
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Tue 2006-07-11 13:34:09 -0500
        message:
          list_files() with wrong normalized_filename code raises exceptions. Fix this
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060711150536-a0dcb33b1581c044
        parent: john at arbash-meinel.com-20060703185147-5097a3ba5310cd2c
        parent: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Tue 2006-07-11 10:05:36 -0500
        message:
          NEWS about fixing #43689
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703185147-5097a3ba5310cd2c
        parent: john at arbash-meinel.com-20060703182735-3081f13e92d7f657
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 13:51:47 -0500
        message:
          On Mac we get EINVAL when renaming cwd
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703182735-3081f13e92d7f657
        parent: john at arbash-meinel.com-20060703181949-2a46f438c62e7b53
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 13:27:35 -0500
        message:
          WorkingTree.open_containing() was directly calling os.getcwdu(), which on mac returns the wrong normalization, and on win32 would have the wrong slashes
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703181949-2a46f438c62e7b53
        parent: john at arbash-meinel.com-20060703161930-c373bd7eddd73011
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 13:19:49 -0500
        message:
          Add a test that urlutils creates normalized paths
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703161930-c373bd7eddd73011
        parent: john at arbash-meinel.com-20060703161321-4d880cc5bca7f670
        parent: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 11:19:30 -0500
        message:
          [merge] bzr.dev 1836
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703161321-4d880cc5bca7f670
        parent: john at arbash-meinel.com-20060703155800-5586e48d39759f49
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 11:13:21 -0500
        message:
          Create a mac version of 'getcwd()' which normalizes the path.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703155800-5586e48d39759f49
        parent: john at arbash-meinel.com-20060703155144-f7a5a4b7695cc159
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 10:58:00 -0500
        message:
          Don't compare direct output of ls, sort first
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703155144-f7a5a4b7695cc159
        parent: john at arbash-meinel.com-20060702062323-b16ead8026bf3977
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Mon 2006-07-03 10:51:44 -0500
        message:
          Use a directory name that doesn't get messed up on Mac for getcwd() test.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702062323-b16ead8026bf3977
        parent: john at arbash-meinel.com-20060702060928-362379b3dbfc5892
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sun 2006-07-02 01:23:23 -0500
        message:
          unicodedata.normalize requires unicode strings
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702060928-362379b3dbfc5892
        parent: john at arbash-meinel.com-20060702060146-3d6984b553b85639
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sun 2006-07-02 01:09:28 -0500
        message:
          Check that WorkingTree.add does the right thing.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702060146-3d6984b553b85639
        parent: john at arbash-meinel.com-20060702054550-e535f24da694acb7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sun 2006-07-02 01:01:46 -0500
        message:
          Test that smart_add_tree does the right thing in the presence of non-normalized filenames
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702054550-e535f24da694acb7
        parent: john at arbash-meinel.com-20060702052812-2edccb8f915f46b2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sun 2006-07-02 00:45:50 -0500
        message:
          make_entry refuses to create non-normalized entries.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702052812-2edccb8f915f46b2
        parent: john at arbash-meinel.com-20060702050725-a7087063326664e8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sun 2006-07-02 00:28:12 -0500
        message:
          A couple no-op cleanups
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702050725-a7087063326664e8
        parent: john at arbash-meinel.com-20060702045547-7a4f2d5c02380603
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sun 2006-07-02 00:07:25 -0500
        message:
          inside workingtree check for normalized filename access
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702045547-7a4f2d5c02380603
        parent: john at arbash-meinel.com-20060702045133-cfda3358025568ff
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sat 2006-07-01 23:55:47 -0500
        message:
          normalized_filename is a much better name
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702045133-cfda3358025568ff
        parent: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: mac
        timestamp: Sat 2006-07-01 23:51:33 -0500
        message:
          Change the return value of unicode_filename, and make it testable on all platforms
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060711002834-437bd17f804929ad
    parent: pqm at pqm.ubuntu.com-20060711002203-adab6e1d8f36bd9e
    parent: john at arbash-meinel.com-20060710235051-1b84cec91844d4f8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-11 01:28:34 +0100
    message:
      (jam) Updates to bundles, handle binary files, non integer timezone offsets, and sftp pull
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710235051-1b84cec91844d4f8
        parent: john at arbash-meinel.com-20060710234835-b266e9cc6e4cf685
        parent: john at arbash-meinel.com-20060710210136-3134b066b8f90aba
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Mon 2006-07-10 18:50:51 -0500
        message:
          [merge] bundle fixes for binary files with \r
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060710210136-3134b066b8f90aba
            parent: pqm at pqm.ubuntu.com-20060710203006-17445a0e4b07b070
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: bundle-binaries
            timestamp: Mon 2006-07-10 16:01:36 -0500
            message:
              fix bug in bundle handling of binary files with just '\r' in them.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710234835-b266e9cc6e4cf685
        parent: john at arbash-meinel.com-20060710232241-7821db1c76587229
        parent: pqm at pqm.ubuntu.com-20060710203006-17445a0e4b07b070
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Mon 2006-07-10 18:48:35 -0500
        message:
          [merge] bzr.dev 1848
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710232241-7821db1c76587229
        parent: john at arbash-meinel.com-20060710231207-5473937e864b14a3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Mon 2006-07-10 18:22:41 -0500
        message:
          Cleanup unpack_highres_date from Aaron's suggestions.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710231207-5473937e864b14a3
        parent: john at arbash-meinel.com-20060710153830-b515e004e3cf2848
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Mon 2006-07-10 18:12:07 -0500
        message:
          Remove debugging mutter() calls
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710153830-b515e004e3cf2848
        parent: john at arbash-meinel.com-20060710151540-81ad659edf6391c0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Mon 2006-07-10 10:38:30 -0500
        message:
          Add a test to timezone for non integer tz offsets
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710151540-81ad659edf6391c0
        parent: john at arbash-meinel.com-20060709070901-f39f56fc35695ed9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Mon 2006-07-10 10:15:40 -0500
        message:
          Removed duplicated highres date code.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060709070901-f39f56fc35695ed9
        parent: john at arbash-meinel.com-20060709070345-e0e4f7ebb679f009
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Sun 2006-07-09 02:09:01 -0500
        message:
          Properly handle non-hour timezone offsets.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060709070345-e0e4f7ebb679f009
        parent: john at arbash-meinel.com-20060707160616-4ede52d0be9d5e45
        parent: john at arbash-meinel.com-20060707164138-f3b923459bc2e9fa
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Sun 2006-07-09 02:03:45 -0500
        message:
          Handle SFTP exceptions
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060707164138-f3b923459bc2e9fa
            parent: john at arbash-meinel.com-20060707160616-4ede52d0be9d5e45
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: bundle-fixes
            timestamp: Fri 2006-07-07 11:41:38 -0500
            message:
              Handle the SFTP exception that you can't read() from the result of get() to a dir
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707160616-4ede52d0be9d5e45
        parent: john at arbash-meinel.com-20060622182425-6f45cb7acd587216
        parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Fri 2006-07-07 11:06:16 -0500
        message:
          [merge] bzr.dev 1843
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060711002203-adab6e1d8f36bd9e
    parent: pqm at pqm.ubuntu.com-20060710203006-17445a0e4b07b070
    parent: jelmer at samba.org-20060705210358-9d755aa12b8f528d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-11 01:22:03 +0100
    message:
      (jelmer) fix 'shared' parameter for BzrDir.create_repository()
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060705210358-9d755aa12b8f528d
        parent: jelmer at samba.org-20060705195619-4c91058b3d8197e2
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Wed 2006-07-05 23:03:58 +0200
        message:
          Add more tests for create_repository().
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060705195619-4c91058b3d8197e2
        parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Wed 2006-07-05 21:56:19 +0200
        message:
          Fix handling of `shared' parameter in BzrDir.create_repository().
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060710203006-17445a0e4b07b070
    parent: pqm at pqm.ubuntu.com-20060710021627-47d5e48ecc36ece7
    parent: abentley at panoramicfeedback.com-20060710202210-9afdbdc3b2706522
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-10 21:30:06 +0100
    message:
      Add test of _unescape_xml
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060710202210-9afdbdc3b2706522
        parent: abentley at panoramicfeedback.com-20060710192353-469477798c5c4139
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: quote-file-ids
        timestamp: Mon 2006-07-10 16:22:10 -0400
        message:
          Add test of _unescape_xml
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060710192353-469477798c5c4139
        parent: abentley at panoramicfeedback.com-20060710190358-ef07d26d07d27cbb
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: quote-file-ids
        timestamp: Mon 2006-07-10 15:23:53 -0400
        message:
          Switch to John Meinel's _unescape_xml implementation
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060710190358-ef07d26d07d27cbb
        parent: abentley at panoramicfeedback.com-20060710154543-07d80f02e1995c45
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: quote-file-ids
        timestamp: Mon 2006-07-10 15:03:58 -0400
        message:
          Add test case for fileid_involved
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060710154543-07d80f02e1995c45
        parent: abentley at panoramicfeedback.com-20060710151057-c328aa11dcd462b1
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: quote-file-ids
        timestamp: Mon 2006-07-10 11:45:43 -0400
        message:
          push handles file-ids with single- and double-quotes correctly (fixes #52227)
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060710151057-c328aa11dcd462b1
        parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: quote-file-ids
        timestamp: Mon 2006-07-10 11:10:57 -0400
        message:
          Add failing tests for funky ids
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060710021627-47d5e48ecc36ece7
    parent: pqm at pqm.ubuntu.com-20060709161745-764d41910ae59c5e
    parent: john at arbash-meinel.com-20060710020654-e609ccb9eca69208
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-10 03:16:27 +0100
    message:
      (jam) Give a better error when paramiko is not present (#47821, #52204)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060710020654-e609ccb9eca69208
        parent: john at arbash-meinel.com-20060707214036-98a85408a56630c2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-errors
        timestamp: Sun 2006-07-09 21:06:54 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707214036-98a85408a56630c2
        parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: transport-errors
        timestamp: Fri 2006-07-07 16:40:36 -0500
        message:
          Update get_transport to raise a nicer error which includes dependency info
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060709161745-764d41910ae59c5e
    parent: pqm at pqm.ubuntu.com-20060708044058-a64fc46ea66545cb
    parent: john at arbash-meinel.com-20060709154702-304436a47a55e265
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-07-09 17:17:45 +0100
    message:
      (jam) update Branch and WorkingTree to properly lock and cleanup
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060709154702-304436a47a55e265
        parent: john at arbash-meinel.com-20060707152242-a7b5e0afd64d9d5a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: two-phase-locking
        timestamp: Sun 2006-07-09 10:47:02 -0500
        message:
          Renaming LockHelpers.py to lock_helpers.py
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707152242-a7b5e0afd64d9d5a
        parent: john at arbash-meinel.com-20060707152033-b9840586a3e0ab49
        parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: two-phase-locking
        timestamp: Fri 2006-07-07 10:22:42 -0500
        message:
          [merge] bzr.dev 1843
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060707152033-b9840586a3e0ab49
        parent: john at arbash-meinel.com-20060701162808-769ff8f2520a65d6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: two-phase-locking
        timestamp: Fri 2006-07-07 10:20:33 -0500
        message:
          Move the new locking tests into their own files, and move the helper functions into a test helper.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060701162808-769ff8f2520a65d6
        parent: john at arbash-meinel.com-20060630203516-15636a2648ee156b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Sat 2006-07-01 11:28:08 -0500
        message:
          Test that other is unlocked even if self fails
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630203516-15636a2648ee156b
        parent: john at arbash-meinel.com-20060630202722-432c791cc076e496
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-30 15:35:16 -0500
        message:
          Branch should lock Repository before it locks self, and unlock self before Repository
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630202722-432c791cc076e496
        parent: john at arbash-meinel.com-20060630195802-c6e78240f04c9d52
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-30 15:27:22 -0500
        message:
          Test that WorkingTree locks Branch before self, and unlocks self before Branch
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630195802-c6e78240f04c9d52
        parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-30 14:58:02 -0500
        message:
          Branch.lock_read/lock_write/unlock should handle failures
          because of the multi-phase of lock and unlock, we should make sure we
          cleanup the locks properly. This is now tested for Branch
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060708044058-a64fc46ea66545cb
    parent: pqm at pqm.ubuntu.com-20060708022646-951515026c3e0cf6
    parent: john at arbash-meinel.com-20060703192726-629d09e2a00190e9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-07-08 05:40:58 +0100
    message:
      (jam) small win32 + FAT32 fix, use different filenames to avoid collisions.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703192726-629d09e2a00190e9
        parent: john at arbash-meinel.com-20060702035858-414b2de9dec7519a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-07-03 14:27:26 -0500
        message:
          Use different filenames to avoid path collisions on win32 w/ FAT32
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060708022646-951515026c3e0cf6
    parent: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
    parent: jrydberg at gnu.org-20060629214829-76f037098d3f2ac9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-07-08 03:26:46 +0100
    message:
      (jrydberg) Let TransportError inherit from BzrNewError
        ------------------------------------------------------------
        merged: jrydberg at gnu.org-20060629214829-76f037098d3f2ac9
        parent: pqm at pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
        committer: Johan Rydberg <jrydberg at gnu.org>
        branch nick: bzr.jrydberg.transport-error
        timestamp: Thu 2006-06-29 23:48:29 +0200
        message:
          Let TransportError inherit BzrNerError.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
    parent: pqm at pqm.ubuntu.com-20060706031529-e189d8c3f42076be
    parent: abentley at panoramicfeedback.com-20060706135122-3c6819dcd96886b7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-06 15:53:59 +0100
    message:
      diff always permits filenames from working directory
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060706135122-3c6819dcd96886b7
        parent: aaron.bentley at utoronto.ca-20060705120125-969be50377a02249
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2006-07-06 09:51:22 -0400
        message:
          Changes from review
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705120125-969be50377a02249
        parent: aaron.bentley at utoronto.ca-20060705051806-857afb07bf645354
        parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-07-05 08:01:25 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705051806-857afb07bf645354
        parent: aaron.bentley at utoronto.ca-20060705050334-81a788244660bb22
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-07-05 01:18:06 -0400
        message:
          Update argument order
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705050334-81a788244660bb22
        parent: aaron.bentley at utoronto.ca-20060705043020-40885528b9673340
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-07-05 01:03:34 -0400
        message:
          Always include working tree when calculating file ids for diff
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705043020-40885528b9673340
        parent: aaron.bentley at utoronto.ca-20060705042200-4ccb4232e524f148
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-07-05 00:30:20 -0400
        message:
          Indentation and documentation fixes
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705042200-4ccb4232e524f148
        parent: aaron.bentley at utoronto.ca-20060705004733-98a8bbb838b550fe
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-07-05 00:22:00 -0400
        message:
          Switch to PathsNotVersioned, accept extra_trees
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705004733-98a8bbb838b550fe
        parent: aaron.bentley at utoronto.ca-20060705003845-c05e0e47dcdf0381
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2006-07-04 20:47:33 -0400
        message:
          Fix docs
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060705003845-c05e0e47dcdf0381
        parent: abentley at panoramicfeedback.com-20060704162105-48840ede345fc8c1
        parent: pqm at pqm.ubuntu.com-20060704173203-6de4c6bbbe1a6149
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2006-07-04 20:38:45 -0400
        message:
          merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060704162105-48840ede345fc8c1
        parent: aaron.bentley at utoronto.ca-20060702193142-16e6b7554e3620db
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2006-07-04 12:21:05 -0400
        message:
          Use specified_file_ids instead of is_inside_any in compare_trees
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060706031529-e189d8c3f42076be
    parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
    parent: john at arbash-meinel.com-20060706022726-769792485a0b6890
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-07-06 04:15:29 +0100
    message:
      (jam) allow plugins to include benchmarks
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706022726-769792485a0b6890
        parent: john at arbash-meinel.com-20060706022434-247817b84f4a5697
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-07-05 21:27:26 -0500
        message:
          Cleanup the imports in bzrlib.benchmark
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706022434-247817b84f4a5697
        parent: john at arbash-meinel.com-20060706022359-db33eb565c78df96
        parent: john at arbash-meinel.com-20060705170259-ec9c1d916a06cdcb
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-07-05 21:24:34 -0500
        message:
          Allow plugins to install have benchmark suites.
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060705170259-ec9c1d916a06cdcb
            parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: plugin-benchmarks
            timestamp: Wed 2006-07-05 12:02:59 -0500
            message:
              Allow plugins to provide benchmarks just like they do tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060706022359-db33eb565c78df96
        parent: john at arbash-meinel.com-20060704144651-22eb63b8cefab365
        parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-07-05 21:23:59 -0500
        message:
          [merge] bzr.dev 1841
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
    parent: pqm at pqm.ubuntu.com-20060704173203-6de4c6bbbe1a6149
    parent: mbp at sourcefrog.net-20060703053839-c22e6ba7a5da7284
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-07-05 01:19:02 +0100
    message:
      (mbp) fix lsprof tests
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060703053839-c22e6ba7a5da7284
        parent: pqm at pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.lsprof
        timestamp: Mon 2006-07-03 15:38:39 +1000
        message:
          [trivial] Simplify & fix up lsprof blackbox test
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060704173203-6de4c6bbbe1a6149
    parent: pqm at pqm.ubuntu.com-20060704150411-48f7a3cfd6338d24
    parent: robertc at robertcollins.net-20060704172300-c4af39f04babcab8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-04 18:32:03 +0100
    message:
      (robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060704172300-c4af39f04babcab8
        parent: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Wed 2006-07-05 03:23:00 +1000
        message:
          (robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060704150411-48f7a3cfd6338d24
    parent: pqm at pqm.ubuntu.com-20060704145739-f2bb0e669a38b3c5
    parent: robey at lag.net-20060703085244-f47e038cd9b01828
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-04 16:04:11 +0100
    message:
      (robey) bzr whoami foo can set your email address
        ------------------------------------------------------------
        merged: robey at lag.net-20060703085244-f47e038cd9b01828
        parent: robey at lag.net-20060629232705-ca3a966b61667850
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Mon 2006-07-03 01:52:44 -0700
        message:
          code style changes
        ------------------------------------------------------------
        merged: robey at lag.net-20060629232705-ca3a966b61667850
        parent: robey at lag.net-20060629232631-73dee390d880c557
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-06-29 16:27:05 -0700
        message:
          in the tutorial, steer users first toward using 'whoami' to set their email
        ------------------------------------------------------------
        merged: robey at lag.net-20060629232631-73dee390d880c557
        parent: robey at lag.net-20060629232558-a7b7c4da6c455841
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-06-29 16:26:31 -0700
        message:
          ammend setting_up_email to mention that 'whoami' can now be used
        ------------------------------------------------------------
        merged: robey at lag.net-20060629232558-a7b7c4da6c455841
        parent: robey at lag.net-20060629232548-25aaee5fe809193c
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-06-29 16:25:58 -0700
        message:
          add whoami info to NEWS
        ------------------------------------------------------------
        merged: robey at lag.net-20060629232548-25aaee5fe809193c
        parent: robey at lag.net-20060629203439-d32a68c74428c9db
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-06-29 16:25:48 -0700
        message:
          fix typo
        ------------------------------------------------------------
        merged: robey at lag.net-20060629203439-d32a68c74428c9db
        parent: robey at lag.net-20060629203417-d400dd001a1c1752
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-06-29 13:34:39 -0700
        message:
          clean up whoami tests a bit
        ------------------------------------------------------------
        merged: robey at lag.net-20060629203417-d400dd001a1c1752
        parent: robey at lag.net-20060629051326-55354a4283dc69da
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Thu 2006-06-29 13:34:17 -0700
        message:
          flesh out 'whoami' docs a little, and don't display the identity after setting it
        ------------------------------------------------------------
        merged: robey at lag.net-20060629051326-55354a4283dc69da
        parent: robey at lag.net-20060629051312-b1c9929c735fc779
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Wed 2006-06-28 22:13:26 -0700
        message:
          move the whoami blackbox tests into their own file and add more tests
        ------------------------------------------------------------
        merged: robey at lag.net-20060629051312-b1c9929c735fc779
        parent: robey at lag.net-20060629051253-f3c6c1306aebcb3d
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Wed 2006-06-28 22:13:12 -0700
        message:
          fix 'whoami' to use encodings and allow setting the global or branch identity
        ------------------------------------------------------------
        merged: robey at lag.net-20060629051253-f3c6c1306aebcb3d
        parent: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.whoami
        timestamp: Wed 2006-06-28 22:12:53 -0700
        message:
          add set_user_option to GlobalConfig, and make /etc/passwd username lookup try harder with encodings
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060704145739-f2bb0e669a38b3c5
    parent: pqm at pqm.ubuntu.com-20060704145000-b12f4f67125ff370
    parent: john at arbash-meinel.com-20060704144651-22eb63b8cefab365
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-04 15:57:39 +0100
    message:
      (jam) cleanup test_non_ascii
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060704144651-22eb63b8cefab365
        parent: john at arbash-meinel.com-20060704140800-70abc37fa2e7f001
        parent: john at arbash-meinel.com-20060703172241-472cf8694c656854
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-04 09:46:51 -0500
        message:
          (jam) cleanup test_non_ascii
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703172241-472cf8694c656854
        parent: john at arbash-meinel.com-20060703165002-c3682f63bddebd31
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-non-ascii
        timestamp: Mon 2006-07-03 12:22:41 -0500
        message:
          Cleanup the rest of the test_non_ascii suite to use internal apis.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703165002-c3682f63bddebd31
        parent: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: cleanup-non-ascii
        timestamp: Mon 2006-07-03 11:50:02 -0500
        message:
          Switch setup to use internals rather than run_bzr
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060704145000-b12f4f67125ff370
    parent: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
    parent: john at arbash-meinel.com-20060704140800-70abc37fa2e7f001
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-07-04 15:50:00 +0100
    message:
      (jam) add reasonable ignores to the bzr.dev tree.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060704140800-70abc37fa2e7f001
        parent: john at arbash-meinel.com-20060704140720-08049e90f7a98e85
        parent: john at arbash-meinel.com-20060704140029-f7d23145ea05d75a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-04 09:08:00 -0500
        message:
          (jam) add reasonable ignores to the bzr.dev tree.
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060704140029-f7d23145ea05d75a
            parent: john at arbash-meinel.com-20060703163808-180fac633586d62a
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: ignores
            timestamp: Tue 2006-07-04 09:00:29 -0500
            message:
              Add emacs ignores, remove old ignores
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060703163808-180fac633586d62a
            parent: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: ignores
            timestamp: Mon 2006-07-03 11:38:08 -0500
            message:
              Cleanup .bzrignore, and include some useful ignores.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060704140720-08049e90f7a98e85
        parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
        parent: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-07-04 09:07:20 -0500
        message:
          [merge] bzr.dev 1836
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060703135648-b927e5efb9f5b907
    parent: pqm at pqm.ubuntu.com-20060703134539-82008abdbc3ba1d4
    parent: john at arbash-meinel.com-20060703134852-295eeb195b8e2811
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-03 14:56:48 +0100
    message:
      (jam) cleanup for win32, close open file handles, tests pass
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703134852-295eeb195b8e2811
        parent: john at arbash-meinel.com-20060703133234-8bd4ed928210ba39
        parent: pqm at pqm.ubuntu.com-20060703134539-82008abdbc3ba1d4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Mon 2006-07-03 08:48:52 -0500
        message:
          [merge] bzr.dev 1835
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703133234-8bd4ed928210ba39
        parent: john at arbash-meinel.com-20060703133054-308be6e88ef781a9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Mon 2006-07-03 08:32:34 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060703133054-308be6e88ef781a9
        parent: john at arbash-meinel.com-20060630145815-6d4609646dd6a5d6
        parent: john at arbash-meinel.com-20060702035858-414b2de9dec7519a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Mon 2006-07-03 08:30:54 -0500
        message:
          [merge] win32: all tests now pass
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702035858-414b2de9dec7519a
        parent: john at arbash-meinel.com-20060702033618-8e8d68c805f04abe
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 22:58:58 -0500
        message:
          Factor out i18n bundle tests, so we don't always skip.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702033618-8e8d68c805f04abe
        parent: john at arbash-meinel.com-20060702025043-e193b9de3448367e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 22:36:18 -0500
        message:
          Include a test to ensure bundles handle trailing whitespace.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702025043-e193b9de3448367e
        parent: john at arbash-meinel.com-20060702014041-e524bbb85dc3c8f8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 21:50:43 -0500
        message:
          Fix order of compare_trees in bundle tests.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702014041-e524bbb85dc3c8f8
        parent: john at arbash-meinel.com-20060701123742-395c3a2e03ea1297
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 20:40:41 -0500
        message:
          Switch from a trailing space to a beginning space, which is supported everywhere.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060701123742-395c3a2e03ea1297
        parent: john at arbash-meinel.com-20060701123059-4a0d5d179ef3b0ae
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 07:37:42 -0500
        message:
          Clean up win32 locks when they fail to lock, so we don't try to unlock them later.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060701123059-4a0d5d179ef3b0ae
        parent: john at arbash-meinel.com-20060701121706-ec8d4120552b20c3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 07:30:59 -0500
        message:
          Switch to using TestSkipped for old win32 problems
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060701121706-ec8d4120552b20c3
        parent: john at arbash-meinel.com-20060701120602-4c069d6d929c9544
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 07:17:06 -0500
        message:
          Switch to using TestSkipped for fileid_involved tests.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060701120602-4c069d6d929c9544
        parent: john at arbash-meinel.com-20060630224322-c8e53eefd1a8b9f6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-07-01 07:06:02 -0500
        message:
          clean up the WorkingTree.open_containing tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630224322-c8e53eefd1a8b9f6
        parent: john at arbash-meinel.com-20060630224239-7c908c96a5e3d3ab
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 17:43:22 -0500
        message:
          Investigating why test_bundle fails, something isn't transmitting properly.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630224239-7c908c96a5e3d3ab
        parent: john at arbash-meinel.com-20060630220100-5e348dced9dfd531
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 17:42:39 -0500
        message:
          Linux raises EBUSY when renaming current directory
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630220100-5e348dced9dfd531
        parent: john at arbash-meinel.com-20060630213852-8a2dd85d080541a1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 17:01:00 -0500
        message:
          try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630213852-8a2dd85d080541a1
        parent: john at arbash-meinel.com-20060630212207-88ba561ade589f52
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 16:38:52 -0500
        message:
          check_text_file was leaving the file handle open, now it closes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630212207-88ba561ade589f52
        parent: john at arbash-meinel.com-20060630174220-1c10cc7585f94c07
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 16:22:07 -0500
        message:
          The api doc tests were using invalid paths on win32, fix them
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630174220-1c10cc7585f94c07
        parent: john at arbash-meinel.com-20060630172730-1e373a1881c2b424
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 12:42:20 -0500
        message:
          transform: cleanup the temporary file even if unique_add fails.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630172730-1e373a1881c2b424
        parent: john at arbash-meinel.com-20060630172527-6d36c06a13dc7110
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 12:27:30 -0500
        message:
          Run the merge_core tests underneath the current test directory, rather than TEMP
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630172527-6d36c06a13dc7110
        parent: john at arbash-meinel.com-20060630165652-c70cb466db18846d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 12:25:27 -0500
        message:
          always close files, minor PEP8 cleanup
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630165652-c70cb466db18846d
        parent: john at arbash-meinel.com-20060630165336-0711b06bfb42dc37
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 11:56:52 -0500
        message:
          file:// urls look slightly different on win32
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630165336-0711b06bfb42dc37
        parent: john at arbash-meinel.com-20060630164834-dcf36d722fcecb86
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 11:53:36 -0500
        message:
          Old repository formats didn't support double locking on win32, don't raise errors
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630164834-dcf36d722fcecb86
        parent: john at arbash-meinel.com-20060630164222-e5bff724acaf456e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 11:48:34 -0500
        message:
          Delay the extra syscall in _win32_rename until we get a failure.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630164222-e5bff724acaf456e
        parent: john at arbash-meinel.com-20060630160009-eb1cae48254281f7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 11:42:22 -0500
        message:
          remove assertDictsEqual
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630160009-eb1cae48254281f7
        parent: john at arbash-meinel.com-20060630154053-5817fd370f6044f7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 11:00:09 -0500
        message:
          Properly handle the case when you want to turn off executability.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630154053-5817fd370f6044f7
        parent: john at arbash-meinel.com-20060630153222-86afc1dde3d4867d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 10:40:53 -0500
        message:
          diff tests check exact texts, should use binary mode for files.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630153222-86afc1dde3d4867d
        parent: john at arbash-meinel.com-20060630151319-d1447bdf800beb34
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 10:32:22 -0500
        message:
          Fix expected value for urlutils tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630151319-d1447bdf800beb34
        parent: john at arbash-meinel.com-20060630133754-4f8a64140f1cbddb
        parent: pqm at pqm.ubuntu.com-20060630150550-7c698ee2cf8678d8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 10:13:19 -0500
        message:
          [merge] bzr.dev 1827
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630133754-4f8a64140f1cbddb
        parent: john at arbash-meinel.com-20060629233654-922fe7dba1ed58c8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Fri 2006-06-30 08:37:54 -0500
        message:
          Clean up the documentation for run_bzr_error on Martin's suggestion.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629233654-922fe7dba1ed58c8
        parent: john at arbash-meinel.com-20060629212308-49ece3a5d9b1a4f1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 18:36:54 -0500
        message:
          Nothing to clean up if self._log_file is None
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629212308-49ece3a5d9b1a4f1
        parent: john at arbash-meinel.com-20060629204629-28d58b0591966eea
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 16:23:08 -0500
        message:
          call tearDown() when tests are skipped
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629204629-28d58b0591966eea
        parent: john at arbash-meinel.com-20060629204440-c611f39cb86767f4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 15:46:29 -0500
        message:
          Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629204440-c611f39cb86767f4
        parent: john at arbash-meinel.com-20060629202643-db14152615498634
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 15:44:40 -0500
        message:
          Don't squelch errors in tt.finalize()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629202643-db14152615498634
        parent: john at arbash-meinel.com-20060629195725-a536f5de2c7c1141
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 15:26:43 -0500
        message:
          Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629195725-a536f5de2c7c1141
        parent: john at arbash-meinel.com-20060629193805-42b6fe906d106a04
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 14:57:25 -0500
        message:
          Call finalize() though it doesn't help to release resources to allow cleanup.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629193805-42b6fe906d106a04
        parent: john at arbash-meinel.com-20060629165841-eb1e32b66f812cbc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 14:38:05 -0500
        message:
          Fix test_fileid_involved so it uses TreeTransform to set the executable bits rather than chmod()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629165841-eb1e32b66f812cbc
        parent: john at arbash-meinel.com-20060629152201-73a22eac267ff59d
        parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 11:58:41 -0500
        message:
          [merge] jam-integration, get remerge test fixes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629152201-73a22eac267ff59d
        parent: john at arbash-meinel.com-20060629052505-264154e2fba31efd
        parent: john at arbash-meinel.com-20060629144844-cb4d5cd64763c4fa
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 10:22:01 -0500
        message:
          refactor test_executable into smaller tests.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629052505-264154e2fba31efd
        parent: john at arbash-meinel.com-20060629052217-8c439d2cd0b243b7
        parent: pqm at pqm.ubuntu.com-20060629034618-75fa8c0c1b44421e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 00:25:05 -0500
        message:
          [merge] bzr.dev 1821
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060703134539-82008abdbc3ba1d4
    parent: pqm at pqm.ubuntu.com-20060703133559-5c53e21b2a358b84
    parent: john at arbash-meinel.com-20060702012107-19434bd3cf2f8e3d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-03 14:45:39 +0100
    message:
      (jam) Make branches.conf -> locations.conf warning more understandable.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702012107-19434bd3cf2f8e3d
        parent: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: branch-conf-fix
        timestamp: Sat 2006-07-01 20:21:07 -0500
        message:
          Make it clearer what config file needs to be renamed.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060703133559-5c53e21b2a358b84
    parent: pqm at pqm.ubuntu.com-20060703110707-5a69d2e6914ddb7c
    parent: john at arbash-meinel.com-20060702020810-6d3ab18e40d3bde7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-03 14:35:59 +0100
    message:
      (jam) Print up to date even if bound, also always print out current revno.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060702020810-6d3ab18e40d3bde7
        parent: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: update-fix
        timestamp: Sat 2006-07-01 21:08:10 -0500
        message:
          Print up to date even if bound, also always print out current revno.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060703110707-5a69d2e6914ddb7c
    parent: pqm at pqm.ubuntu.com-20060703074905-677c02d441974aea
    parent: robertc at robertcollins.net-20060703082358-7d90b2eea96e060c
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-03 12:07:07 +0100
    message:
      (robertc) Add in missing test_ignore.py.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060703082358-7d90b2eea96e060c
        parent: pqm at pqm.ubuntu.com-20060703074905-677c02d441974aea
        parent: robertc at robertcollins.net-20060703081223-b106037c3fb29160
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2006-07-03 18:23:58 +1000
        message:
          (robertc) Add in missing test_ignore.py.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060703081223-b106037c3fb29160
        parent: robertc at robertcollins.net-20060703063236-d41ae2136601a813
        parent: pqm at pqm.ubuntu.com-20060703074905-677c02d441974aea
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: ignored
        timestamp: Mon 2006-07-03 18:12:23 +1000
        message:
          Merge from integration.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060703063236-d41ae2136601a813
        parent: robertc at robertcollins.net-20060612125218-90f6db8100e0a931
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: ignored
        timestamp: Mon 2006-07-03 16:32:36 +1000
        message:
          Add missing test_ignore.py
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060703074905-677c02d441974aea
    parent: pqm at pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
    parent: mbp at sourcefrog.net-20060703052724-c8fea76b5471b643
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-07-03 08:49:05 +0100
    message:
      (mbp) remove default ignore pattern list
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060703052724-c8fea76b5471b643
        parent: mbp at sourcefrog.net-20060703045944-3b6a4e9d2c693b1e
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.merge.no-ignores
        timestamp: Mon 2006-07-03 15:27:24 +1000
        message:
          Fix up blackbox ignore-rule test
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060703045944-3b6a4e9d2c693b1e
        parent: pqm at pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
        parent: robertc at robertcollins.net-20060612125218-90f6db8100e0a931
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.merge.no-ignores
        timestamp: Mon 2006-07-03 14:59:44 +1000
        message:
          [merge] remove default ignore list & update
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060612125218-90f6db8100e0a931
        parent: pqm at pqm.ubuntu.com-20060612011214-3f50082086eb3ef6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: ignored
        timestamp: Mon 2006-06-12 22:52:18 +1000
        message:
          Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
    parent: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
    parent: aaron.bentley at utoronto.ca-20060702193142-16e6b7554e3620db
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-07-02 20:48:18 +0100
    message:
      Remerge doesn't clobber conflicts on other files
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060702193142-16e6b7554e3620db
        parent: aaron.bentley at utoronto.ca-20060702174537-91ecf9e179632707
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2006-07-02 15:31:42 -0400
        message:
          Switched from actual, expected to expected, actual, for John.
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060702174537-91ecf9e179632707
        parent: aaron.bentley at utoronto.ca-20060702173533-e3defd8577472473
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2006-07-02 13:45:37 -0400
        message:
          Fix spacing
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060702173533-e3defd8577472473
        parent: aaron.bentley at utoronto.ca-20060702003110-3d19fd4e139321ff
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2006-07-02 13:35:33 -0400
        message:
          Add WorkingTree.add_conflicts
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060702003110-3d19fd4e139321ff
        parent: aaron.bentley at utoronto.ca-20060701183657-5426563f230a6232
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sat 2006-07-01 20:31:10 -0400
        message:
          Remerge doesn't clear unrelated conflicts
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060702004915-501855cc9fc14e10
    parent: pqm at pqm.ubuntu.com-20060701184616-b0b6979d6f86a5a1
    parent: robey at lag.net-20060701190333-f58465aec4bd3412
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-07-02 01:49:15 +0100
    message:
      (robey) updates for lsprof
        ------------------------------------------------------------
        merged: robey at lag.net-20060701190333-f58465aec4bd3412
        parent: robey at lag.net-20060630063602-32b5927790ea757f
        parent: pqm at pqm.ubuntu.com-20060701184616-b0b6979d6f86a5a1
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Sat 2006-07-01 12:03:33 -0700
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: robey at lag.net-20060630063602-32b5927790ea757f
        parent: robey at lag.net-20060620175656-f6938f2267ccc2fe
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Thu 2006-06-29 23:36:02 -0700
        message:
          pull over some changes from the original lsprof
        ------------------------------------------------------------
        merged: robey at lag.net-20060620175656-f6938f2267ccc2fe
        parent: robey at lag.net-20060618235722-9e31e12dadff52a8
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Tue 2006-06-20 10:56:56 -0700
        message:
          when giving --lsprof-file, assume --lsprof
        ------------------------------------------------------------
        merged: robey at lag.net-20060618235722-9e31e12dadff52a8
        parent: robey at lag.net-20060618184203-f09b11e7466bab4e
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Sun 2006-06-18 16:57:22 -0700
        message:
          jam points out this import is superfluous
        ------------------------------------------------------------
        merged: robey at lag.net-20060618184203-f09b11e7466bab4e
        parent: robey at lag.net-20060612052416-52c92cf7ec9630cf
        parent: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Sun 2006-06-18 11:42:03 -0700
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: robey at lag.net-20060612052416-52c92cf7ec9630cf
        parent: robey at lag.net-20060518063731-f348648fe7bbedd7
        parent: pqm at pqm.ubuntu.com-20060612011214-3f50082086eb3ef6
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Sun 2006-06-11 22:24:16 -0700
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: robey at lag.net-20060518063731-f348648fe7bbedd7
        parent: robey at lag.net-20060513210803-76618c4740588804
        parent: pqm at pqm.ubuntu.com-20060518035414-0eeb99fb74b5436d
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Wed 2006-05-17 23:37:31 -0700
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: robey at lag.net-20060513210803-76618c4740588804
        parent: pqm at pqm.ubuntu.com-20060511175037-f66b84c6a9fc4c12
        parent: robey at lag.net-20060222173242-9756df7e2fa21eca
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Sat 2006-05-13 14:08:03 -0700
        message:
          merge patches from pre-knit branch
        ------------------------------------------------------------
        merged: robey at lag.net-20060222173242-9756df7e2fa21eca
        parent: robey at master-shake.local-20060203181820-6732bb55895a5c7d
        parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
        committer: Robey Pointer <robey at lag.net>
        branch nick: bzr.dev.lsprof
        timestamp: Wed 2006-02-22 09:32:42 -0800
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: robey at master-shake.local-20060203181820-6732bb55895a5c7d
        parent: robey at dhcp-192-168-1-88.danger.com-20060202014206-bf6c5b6d352b93dd
        committer: Robey Pointer <robey at master-shake.local>
        branch nick: bzr.dev.lsprof
        timestamp: Fri 2006-02-03 10:18:20 -0800
        message:
          patch from ddaa to add kcachegrind output-format support to lsprof
        ------------------------------------------------------------
        merged: robey at dhcp-192-168-1-88.danger.com-20060202014206-bf6c5b6d352b93dd
        parent: robey at dhcp-192-168-1-88.danger.com-20060202012032-470e0c5616813e44
        committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
        branch nick: bzr.dev.lsprof
        timestamp: Wed 2006-02-01 17:42:06 -0800
        message:
          add threading support -- each thread created during an lsprof session gets its own profile object, and the Stats objects are attached to a 'threads' member of the final Stats object
        ------------------------------------------------------------
        merged: robey at dhcp-192-168-1-88.danger.com-20060202012032-470e0c5616813e44
        parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
        committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
        branch nick: bzr.dev.lsprof
        timestamp: Wed 2006-02-01 17:20:32 -0800
        message:
          add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal)
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060701184616-b0b6979d6f86a5a1
    parent: pqm at pqm.ubuntu.com-20060630200309-cf230b3c813bbc35
    parent: aaron.bentley at utoronto.ca-20060701183657-5426563f230a6232
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-07-01 19:46:16 +0100
    message:
      bzr revert DIRNAME works recursively
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060701183657-5426563f230a6232
        parent: aaron.bentley at utoronto.ca-20060701015446-639a367f3f247f74
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sat 2006-07-01 14:36:57 -0400
        message:
          Update for review comments
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060701015446-639a367f3f247f74
        parent: abentley at panoramicfeedback.com-20060630231430-ff39ffaa48c8e910
        parent: pqm at pqm.ubuntu.com-20060630200309-cf230b3c813bbc35
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2006-06-30 21:54:46 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060630231430-ff39ffaa48c8e910
        parent: aaron.bentley at utoronto.ca-20060626050607-f55d47d701b57ffd
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2006-06-30 19:14:30 -0400
        message:
          Handle revert DIRECTORY
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060626050607-f55d47d701b57ffd
        parent: abentley at panoramicfeedback.com-20060621171427-6f56648c1b5ee943
        parent: pqm at pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2006-06-26 01:06:07 -0400
        message:
          merge bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060630200309-cf230b3c813bbc35
    parent: pqm at pqm.ubuntu.com-20060630150550-7c698ee2cf8678d8
    parent: robertc at robertcollins.net-20060630185410-f2dc46c12eab83f4
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-30 21:03:09 +0100
    message:
      Add BranchConfig.has_explicit_nickname call.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060630185410-f2dc46c12eab83f4
        parent: pqm at pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch
        timestamp: Sat 2006-07-01 04:54:10 +1000
        message:
          Add BranchConfig.has_explicit_nickname call.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060630150550-7c698ee2cf8678d8
    parent: pqm at pqm.ubuntu.com-20060630141636-ff9bc95119de3c3f
    parent: john at arbash-meinel.com-20060630145815-6d4609646dd6a5d6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-30 16:05:50 +0100
    message:
      (jam) fix sftp tests for win32, fix drive letter inconsistency
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630145815-6d4609646dd6a5d6
        parent: john at arbash-meinel.com-20060630145722-a1a54b622e7ec699
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Fri 2006-06-30 09:58:15 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630145722-a1a54b622e7ec699
        parent: john at arbash-meinel.com-20060630140839-e7c177e3fc52a358
        parent: john at arbash-meinel.com-20060630145537-7a817961291b7f4b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Fri 2006-06-30 09:57:22 -0500
        message:
          [merge] sftp fixes for win32 (and drive letters)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630145537-7a817961291b7f4b
        parent: john at arbash-meinel.com-20060629052217-8c439d2cd0b243b7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-sftp
        timestamp: Fri 2006-06-30 09:55:37 -0500
        message:
          Update stub_sftp based on Robey's comments.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629052217-8c439d2cd0b243b7
        parent: john at arbash-meinel.com-20060629050820-9357c771aed180f9
        parent: john at arbash-meinel.com-20060629052040-912053fc36f6dd99
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 00:22:17 -0500
        message:
          merge more sftp fixes
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060629052040-912053fc36f6dd99
            parent: john at arbash-meinel.com-20060629051723-b76336a0994291e1
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32-sftp
            timestamp: Thu 2006-06-29 00:20:40 -0500
            message:
              Fix regression on unicode tests for SFTP under Linux
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060629051723-b76336a0994291e1
            parent: john at arbash-meinel.com-20060629051127-61c3f8da94f2d3ca
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32-sftp
            timestamp: Thu 2006-06-29 00:17:23 -0500
            message:
              Clean up paramiko agent support.
            ------------------------------------------------------------
            merged: john at arbash-meinel.com-20060629051127-61c3f8da94f2d3ca
            parent: john at arbash-meinel.com-20060629040832-929ebb7408247e38
            parent: lalinsky at gmail.com-20060623083027-276c4b348a04c0a0
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32-sftp
            timestamp: Thu 2006-06-29 00:11:27 -0500
            message:
              [merge] enable SSH-agent for paramiko 1.6
            ------------------------------------------------------------
            merged: lalinsky at gmail.com-20060623083027-276c4b348a04c0a0
            parent: pqm at pqm.ubuntu.com-20060622200147-08093baa0cf46599
            committer: Lukáš Lalinský <lalinsky at gmail.com>
            branch nick: bzr.win32_fix
            timestamp: Fri 2006-06-23 10:30:27 +0200
            message:
              Use SSH-agent on win32 if we have Paramiko 1.6
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629050820-9357c771aed180f9
        parent: john at arbash-meinel.com-20060629040832-929ebb7408247e38
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Thu 2006-06-29 00:08:20 -0500
        message:
          win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629040832-929ebb7408247e38
        parent: john at arbash-meinel.com-20060629040502-1a8b492e860320d9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-sftp
        timestamp: Wed 2006-06-28 23:08:32 -0500
        message:
          Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060630141636-ff9bc95119de3c3f
    parent: pqm at pqm.ubuntu.com-20060630113821-02c5914482b84bb2
    parent: john at arbash-meinel.com-20060630140839-e7c177e3fc52a358
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-30 15:16:36 +0100
    message:
      (jam) call tearDown when a test is Skipped, update run_bzr_error docs.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630140839-e7c177e3fc52a358
        parent: john at arbash-meinel.com-20060630140616-074ad0ebb523972f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Fri 2006-06-30 09:08:39 -0500
        message:
          cherrypick accepted win32 fixes: call tearDown for skipped tests, update docs for run_bzr_error
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060630140616-074ad0ebb523972f
        parent: john at arbash-meinel.com-20060629144844-cb4d5cd64763c4fa
        parent: pqm at pqm.ubuntu.com-20060630113821-02c5914482b84bb2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Fri 2006-06-30 09:06:16 -0500
        message:
          [merge] bzr.dev 1825
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060630113821-02c5914482b84bb2
    parent: pqm at pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
    parent: aaron.bentley at utoronto.ca-20060629061138-6230b820695698b0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-30 12:38:21 +0100
    message:
      Merge handles contents + executable + deletion conflict
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060629061138-6230b820695698b0
        parent: aaron.bentley at utoronto.ca-20060628050714-f5c68e380ac36c41
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ttransform
        timestamp: Thu 2006-06-29 02:11:38 -0400
        message:
          Merge handles contents + executable + deletion conflict
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060628050714-f5c68e380ac36c41
        parent: aaron.bentley at utoronto.ca-20060525042123-3289bf33a73ef194
        parent: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ttransform
        timestamp: Wed 2006-06-28 01:07:14 -0400
        message:
          Merge mainline
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
    parent: pqm at pqm.ubuntu.com-20060629170726-bc2f3986d337be18
    parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-29 19:21:57 +0100
    message:
      (jam) add run_bzr_error, clean up remerge tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
        parent: john at arbash-meinel.com-20060629165104-f702406d391ea956
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-29 11:52:35 -0500
        message:
          Update test_remerge with new api, and minor fixes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629165104-f702406d391ea956
        parent: john at arbash-meinel.com-20060629163047-bcd77c46dc893d4b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-29 11:51:04 -0500
        message:
          Default to retcode=3, and add a test for run_bzr_error
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629163047-bcd77c46dc893d4b
        parent: john at arbash-meinel.com-20060628201853-1707d1bf66b43c41
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-29 11:30:47 -0500
        message:
          Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060629170726-bc2f3986d337be18
    parent: pqm at pqm.ubuntu.com-20060629152015-62f5695e00233860
    parent: abentley at panoramicfeedback.com-20060629162456-9dbd1c2795d474dd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-29 18:07:26 +0100
    message:
      Clean up bundle command
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060629162456-9dbd1c2795d474dd
        parent: abentley at panoramicfeedback.com-20060629160813-da21baf069d79708
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Thu 2006-06-29 12:24:56 -0400
        message:
          More notes on 'note'
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060629160813-da21baf069d79708
        parent: abentley at panoramicfeedback.com-20060626180107-ec9e2e851569e2d8
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Thu 2006-06-29 12:08:13 -0400
        message:
          Update bundle command to use urlutils for emitting saved location
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060626180107-ec9e2e851569e2d8
        parent: abentley at panoramicfeedback.com-20060626170733-a7e1ea76475db584
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Mon 2006-06-26 14:01:07 -0400
        message:
          Clean up bundle revision specification
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060626170733-a7e1ea76475db584
        parent: abentley at panoramicfeedback.com-20060626165502-6b7a030e6ba151a2
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Mon 2006-06-26 13:07:33 -0400
        message:
          Use single make function for tests
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060626165502-6b7a030e6ba151a2
        parent: abentley at panoramicfeedback.com-20060626162434-b0112b1f1f2957c5
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Mon 2006-06-26 12:55:02 -0400
        message:
          Avoid duplicating the 'Using specified base' message
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060626162434-b0112b1f1f2957c5
        parent: abentley at panoramicfeedback.com-20060621204144-6a6b715b0f2508a0
        parent: pqm at pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Mon 2006-06-26 12:24:34 -0400
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060629152015-62f5695e00233860
    parent: pqm at pqm.ubuntu.com-20060629034618-75fa8c0c1b44421e
    parent: john at arbash-meinel.com-20060629144844-cb4d5cd64763c4fa
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-29 16:20:15 +0100
    message:
      (jam) win32 fixes: #45010, EPIPE, test suite fixes
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629144844-cb4d5cd64763c4fa
        parent: john at arbash-meinel.com-20060629144129-11a340d1943835d0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Thu 2006-06-29 09:48:44 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629144129-11a340d1943835d0
        parent: john at arbash-meinel.com-20060629040502-1a8b492e860320d9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32-accepted
        timestamp: Thu 2006-06-29 09:41:29 -0500
        message:
          By Martin's suggestion, break the long test into lots of small ones.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629040502-1a8b492e860320d9
        parent: john at arbash-meinel.com-20060629033030-6c466c81419ff3e5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Wed 2006-06-28 23:05:02 -0500
        message:
          Skip permission tests on win32 no modebits
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060629033030-6c466c81419ff3e5
        parent: john at arbash-meinel.com-20060628163404-41f0ba88a954a86e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Wed 2006-06-28 22:30:30 -0500
        message:
          Catch proper error instead of EPIPE on win32, also don't double flush
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628163404-41f0ba88a954a86e
        parent: john at arbash-meinel.com-20060626231138-cbb880206962abcf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Wed 2006-06-28 11:34:04 -0500
        message:
          Don't peak under the covers, and test all working tree implementations for executable success (suggested by Robert Collins)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626231138-cbb880206962abcf
        parent: john at arbash-meinel.com-20060626223428-b3ac7f2bbc3a7823
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 18:11:38 -0500
        message:
          Alexander Belchenko, fix test_config to use ensure_config_dir, rather than os.mkdir()
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626223428-b3ac7f2bbc3a7823
        parent: john at arbash-meinel.com-20060626195245-acaff85631d5a558
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 17:34:28 -0500
        message:
          Update the test suite for Alexander's patch.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626195245-acaff85631d5a558
        parent: john at arbash-meinel.com-20060626190655-ab795ddd5442710e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 14:52:45 -0500
        message:
          Add a test that executable=yes exists in .bzr/checkout/inventory
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626190655-ab795ddd5442710e
        parent: john at arbash-meinel.com-20060626183210-b38aadc3ede77477
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 14:06:55 -0500
        message:
          Fix #45010 correctly. Don't forget the execute bit.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626183210-b38aadc3ede77477
        parent: john at arbash-meinel.com-20060626170429-b3d97d5a0aba2f91
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 13:32:10 -0500
        message:
          Fix bug #45010 by always setting the executable bit on win32.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626170429-b3d97d5a0aba2f91
        parent: john at arbash-meinel.com-20060626163422-f7b704caae4f980b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 12:04:29 -0500
        message:
          move the revert tests out of test_too_much.py
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626163422-f7b704caae4f980b
        parent: john at arbash-meinel.com-20060626163149-2213f2f2d895829d
        parent: bialix at ukr.net-20060624063017-a1bff7e3e9641cf5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 11:34:22 -0500
        message:
          [merge] Alexander Belchenko, use uppercase for drive letters.
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060624063017-a1bff7e3e9641cf5
            parent: pqm at pqm.ubuntu.com-20060623181520-082f8258c961b88f
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: bzr.dev.bialix
            timestamp: Sat 2006-06-24 09:30:17 +0300
            message:
              win32: convert drive letter to uppercase, not lowercase
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060626163149-2213f2f2d895829d
        parent: john at arbash-meinel.com-20060620010414-6046fc4038b56bf0
        parent: pqm at pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-26 11:31:49 -0500
        message:
          [merge] bzr.dev 1813
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060629034618-75fa8c0c1b44421e
    parent: pqm at pqm.ubuntu.com-20060628191453-cabfd41ee7ad6522
    parent: john at arbash-meinel.com-20060628201853-1707d1bf66b43c41
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-29 04:46:18 +0100
    message:
      (bialix) fix non-ascii handling for 'bzr missing'
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628201853-1707d1bf66b43c41
        parent: john at arbash-meinel.com-20060628190701-30b004adc5e5c47d
        parent: bialix at ukr.net-20060627210522-5f95353170bb49b7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 15:18:53 -0500
        message:
          [merge] Alexander Belchenko: fix non-ascii handling for 'bzr missing'
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060627210522-5f95353170bb49b7
        parent: bialix at ukr.net-20060627210508-04a3a55608df664e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: encoding
        timestamp: Wed 2006-06-28 00:05:22 +0300
        message:
          fix non-ascii messages handling in 'missing' command
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060627210508-04a3a55608df664e
        parent: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: encoding
        timestamp: Wed 2006-06-28 00:05:08 +0300
        message:
          blackbox test for non-ascii behaviour of missing command
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060628191453-cabfd41ee7ad6522
    parent: pqm at pqm.ubuntu.com-20060628140650-135f9ed05d63075c
    parent: john at arbash-meinel.com-20060628190701-30b004adc5e5c47d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-28 20:14:53 +0100
    message:
      (robey) Absorb EPIPE in test SFTPServer
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628190701-30b004adc5e5c47d
        parent: john at arbash-meinel.com-20060628164342-3bf31f606ecb01c2
        parent: robey at lag.net-20060623001948-c66d75472c755ded
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 14:07:01 -0500
        message:
          [merge] Robey Pointer: Test SFTPServer absorbs EPIPE when client disappears.
            ------------------------------------------------------------
            merged: robey at lag.net-20060623001948-c66d75472c755ded
            parent: pqm at pqm.ubuntu.com-20060622200147-08093baa0cf46599
            committer: Robey Pointer <robey at lag.net>
            branch nick: bzr.dev.one-shot
            timestamp: Thu 2006-06-22 17:19:48 -0700
            message:
              absorb a broken-pipe exception from paramiko when running the unit tests.  it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628164342-3bf31f606ecb01c2
        parent: john at arbash-meinel.com-20060628135843-f5edb57ece84fea5
        parent: pqm at pqm.ubuntu.com-20060628140650-135f9ed05d63075c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 11:43:42 -0500
        message:
          [merge] bzr.dev 1819
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060628140650-135f9ed05d63075c
    parent: pqm at pqm.ubuntu.com-20060628135730-69c51a8debcc73f7
    parent: john at arbash-meinel.com-20060628135843-f5edb57ece84fea5
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-28 15:06:50 +0100
    message:
      (jelmer) fix pending-merge exception checking
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628135843-f5edb57ece84fea5
        parent: john at arbash-meinel.com-20060628134735-84eb08db9be11e00
        parent: jelmer at samba.org-20060627084732-3c3fdc02e5bea94e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 08:58:43 -0500
        message:
          [merge] Jelmer Vernooij: fix pending-merge exception checking
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060627084732-3c3fdc02e5bea94e
        parent: jelmer at samba.org-20060627005214-ada07acfa15484b7
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Tue 2006-06-27 10:47:32 +0200
        message:
          Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060627005214-ada07acfa15484b7
        parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Tue 2006-06-27 02:52:14 +0200
        message:
          Catch right exception to detect pending-merges file is missing.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060628135730-69c51a8debcc73f7
    parent: pqm at pqm.ubuntu.com-20060628130148-518e8b848cbb78c5
    parent: john at arbash-meinel.com-20060628134735-84eb08db9be11e00
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-28 14:57:30 +0100
    message:
      (jelmer): Fix comment in Branch.open
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628134735-84eb08db9be11e00
        parent: john at arbash-meinel.com-20060628125354-65441b98c7383be9
        parent: jelmer at samba.org-20060627005818-622971c3e6b95cd2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 08:47:35 -0500
        message:
          [merge] Jelmer Vernooij: Fix comment in Branch.open
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060627005818-622971c3e6b95cd2
        parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Tue 2006-06-27 02:58:18 +0200
        message:
          Fix copy-pasted comment.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060628130148-518e8b848cbb78c5
    parent: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
    parent: john at arbash-meinel.com-20060628125354-65441b98c7383be9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-28 14:01:48 +0100
    message:
      (mpe) Add cvs/svn aliases 'co' and 'ann' for checkout and annotate, respectively
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628125354-65441b98c7383be9
        parent: john at arbash-meinel.com-20060628125233-621fa4989b83975b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 07:53:54 -0500
        message:
          NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060628125233-621fa4989b83975b
        parent: john at arbash-meinel.com-20060627122008-4f1257a91a96cace
        parent: michael at ellerman.id.au-20060628042344-8e61593df0f67f3d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-28 07:52:33 -0500
        message:
          [merge] mpe: Add 'co' and 'ann'
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060628042344-8e61593df0f67f3d
        parent: michael at ellerman.id.au-20060628042009-ff9436dd348abc48
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Wed 2006-06-28 14:23:44 +1000
        message:
          Add CVS compatible aliases for checkout and annotate, from fullermd.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060628042009-ff9436dd348abc48
        parent: michael at ellerman.id.au-20060618232130-6723c407d86a957b
        parent: pqm at pqm.ubuntu.com-20060620063849-400861427a3a9ff1
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Wed 2006-06-28 14:20:09 +1000
        message:
          Merge trunk.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
    parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
    parent: john at arbash-meinel.com-20060627122008-4f1257a91a96cace
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-27 14:31:54 +0100
    message:
      (erik bågfors) remove duplicate lines in help and NEWS (bug #50561)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060627122008-4f1257a91a96cace
        parent: john at arbash-meinel.com-20060627121621-e669e881b9578105
        parent: erik at bagfors.nu-20060611182629-df10b9c49e54be8d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-06-27 07:20:08 -0500
        message:
          [merge] Erik Bagfors: remove duplicate help (bug #50561)
            ------------------------------------------------------------
            merged: erik at bagfors.nu-20060611182629-df10b9c49e54be8d
            parent: erik at bagfors.nu-20060611182622-149f12eecd418eb3
            committer: Erik BÃ¥gfors <erik at bagfors.nu>
            branch nick: bzr.fixes
            timestamp: Sun 2006-06-11 20:26:29 +0200
            message:
              remove duplicate text from "help pull"
            ------------------------------------------------------------
            merged: erik at bagfors.nu-20060611182622-149f12eecd418eb3
            parent: pqm at pqm.ubuntu.com-20060611151400-2bf5c558ffe989f7
            committer: Erik BÃ¥gfors <erik at bagfors.nu>
            branch nick: bzr.fixes
            timestamp: Sun 2006-06-11 20:26:22 +0200
            message:
              removed duplication news entry
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060627121621-e669e881b9578105
        parent: john at arbash-meinel.com-20060623162626-de7ec2a984935589
        parent: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2006-06-27 07:16:21 -0500
        message:
          [merge] bzr.dev 1815
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060626193547-43661d1377f72b4d
    parent: pqm at pqm.ubuntu.com-20060626192951-fc24d4afed7dcd00
    parent: robertc at robertcollins.net-20060626162310-98f5b55b8cc19d46
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-26 20:35:47 +0100
    message:
      (robertc) Misc minor typos and the like.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060626162310-98f5b55b8cc19d46
        parent: pqm at pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
        parent: robertc at robertcollins.net-20060616170342-1094ed388f0a9fce
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Tue 2006-06-27 02:23:10 +1000
        message:
          (robertc) Misc minor typos and the like.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616170342-1094ed388f0a9fce
        parent: robertc at robertcollins.net-20060616162847-57a5dc75b223506b
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: misc-fixen
        timestamp: Sat 2006-06-17 03:03:42 +1000
        message:
          Remove some unused imports.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060626192951-fc24d4afed7dcd00
    parent: pqm at pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
    parent: john at arbash-meinel.com-20060623162626-de7ec2a984935589
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-26 20:29:51 +0100
    message:
      (jam) fix no-changes commit to raise the right exception.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060623162626-de7ec2a984935589
        parent: john at arbash-meinel.com-20060623162506-b9daea539cd1d577
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-23 11:26:26 -0500
        message:
          Fix an empty commit to raise the right exception.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060623162506-b9daea539cd1d577
        parent: john at arbash-meinel.com-20060617011815-9139c00d8b51e54b
        parent: pqm at pqm.ubuntu.com-20060623155016-476962c2dd4938a2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-23 11:25:06 -0500
        message:
          [merge] bzr.dev 1807
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
    parent: pqm at pqm.ubuntu.com-20060626015555-890ca5238fb0f70c
    parent: aaron.bentley at utoronto.ca-20060625234002-7e3ac9e115966213
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-26 03:01:54 +0100
    message:
      Remove basis knit support
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625234002-7e3ac9e115966213
        parent: aaron.bentley at utoronto.ca-20060625213229-b75551f64a4acf69
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sun 2006-06-25 19:40:02 -0400
        message:
          Remove basis knit support
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625213229-b75551f64a4acf69
        parent: abentley at panoramicfeedback.com-20060623185828-e3722e7048bc33a4
        parent: pqm at pqm.ubuntu.com-20060625211758-dd63e738364eff83
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sun 2006-06-25 17:32:29 -0400
        message:
          merge bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060626015555-890ca5238fb0f70c
    parent: pqm at pqm.ubuntu.com-20060625211758-dd63e738364eff83
    parent: aaron.bentley at utoronto.ca-20060625231809-224c5facfe6bcd69
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-26 02:55:55 +0100
    message:
      Remove knit caches
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625231809-224c5facfe6bcd69
        parent: aaron.bentley at utoronto.ca-20060625210437-177daa5dfc94f0a1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sun 2006-06-25 19:18:09 -0400
        message:
          Remove knit caches
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060625211758-dd63e738364eff83
    parent: pqm at pqm.ubuntu.com-20060625172841-db84e4fa7f50f885
    parent: aaron.bentley at utoronto.ca-20060625210437-177daa5dfc94f0a1
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-25 22:17:58 +0100
    message:
      Speed up log -v
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625210437-177daa5dfc94f0a1
        parent: aaron.bentley at utoronto.ca-20060625195133-8fcab53b954ac17b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sun 2006-06-25 17:04:37 -0400
        message:
          Tweaks from review
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625195133-8fcab53b954ac17b
        parent: aaron.bentley at utoronto.ca-20060625044221-9d213bce8d8d2cbe
        parent: pqm at pqm.ubuntu.com-20060625172841-db84e4fa7f50f885
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sun 2006-06-25 15:51:33 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625044221-9d213bce8d8d2cbe
        parent: aaron.bentley at utoronto.ca-20060625013856-1b97ee9125d90988
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sun 2006-06-25 00:42:21 -0400
        message:
          Tests for get_revision_deltas and revisions_trees
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625013856-1b97ee9125d90988
        parent: aaron.bentley at utoronto.ca-20060625010629-454d2f1df926c2fb
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 21:38:56 -0400
        message:
          Documentation and cleanups
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625010629-454d2f1df926c2fb
        parent: aaron.bentley at utoronto.ca-20060625005748-ac358124ad3dbd81
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 21:06:29 -0400
        message:
          More cleanup
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625005748-ac358124ad3dbd81
        parent: aaron.bentley at utoronto.ca-20060625005417-27a56c1a0abf8852
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 20:57:48 -0400
        message:
          Combine get_components_positions with get_components_versions
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625005417-27a56c1a0abf8852
        parent: aaron.bentley at utoronto.ca-20060625003927-ac097ad8cd7bf4c4
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 20:54:17 -0400
        message:
          zap more dead code
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625003927-ac097ad8cd7bf4c4
        parent: aaron.bentley at utoronto.ca-20060625000343-7767d012c1150ef2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 20:39:27 -0400
        message:
          Remove old code paths
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060625000343-7767d012c1150ef2
        parent: aaron.bentley at utoronto.ca-20060624182348-df20ee15979249f9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 20:03:43 -0400
        message:
          Handle the intermediate and final representations of no-final-eol texts
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624182348-df20ee15979249f9
        parent: aaron.bentley at utoronto.ca-20060624163830-76252f9d8dd3c89e
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 14:23:48 -0400
        message:
          Refactor get_line_list into _get_content
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624163830-76252f9d8dd3c89e
        parent: aaron.bentley at utoronto.ca-20060624161939-105991f9056b7b9c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 12:38:30 -0400
        message:
          Stuff all text-building data in record_map
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624161939-105991f9056b7b9c
        parent: aaron.bentley at utoronto.ca-20060624160729-c4eb0028ce90e226
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 12:19:39 -0400
        message:
          Fix content_map corruption
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624160729-c4eb0028ce90e226
        parent: aaron.bentley at utoronto.ca-20060624082214-830626bb760babed
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 12:07:29 -0400
        message:
          Optimize selection and retrieval of records
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624082214-830626bb760babed
        parent: aaron.bentley at utoronto.ca-20060624064120-ca210d8efd3c13b2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 04:22:14 -0400
        message:
          More optimization refactoring
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624064120-ca210d8efd3c13b2
        parent: aaron.bentley at utoronto.ca-20060624055821-123b47ddc04748a5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 02:41:20 -0400
        message:
          Avoid unused calls, use generators, sets instead of lists
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624055821-123b47ddc04748a5
        parent: aaron.bentley at utoronto.ca-20060624043653-87c3453916d9121e
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 01:58:21 -0400
        message:
          Avoid re-parsing texts version components
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624043653-87c3453916d9121e
        parent: aaron.bentley at utoronto.ca-20060624042310-2998b13f7c2ae19a
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 00:36:53 -0400
        message:
          More multi-text extraction
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624042310-2998b13f7c2ae19a
        parent: aaron.bentley at utoronto.ca-20060624033950-50525f2ecac91f1a
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Sat 2006-06-24 00:23:10 -0400
        message:
          Switch to get_texts, optimize get_texts
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624033950-50525f2ecac91f1a
        parent: aaron.bentley at utoronto.ca-20060624013356-9f6ef2abb1fa4fc7
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Fri 2006-06-23 23:39:50 -0400
        message:
          Fix bug getting texts when line deltas were reused
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060624013356-9f6ef2abb1fa4fc7
        parent: aaron.bentley at utoronto.ca-20060623234550-02631af67b4da1c0
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Fri 2006-06-23 21:33:56 -0400
        message:
          More refactoring, introduce revision_trees.
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060623234550-02631af67b4da1c0
        parent: aaron.bentley at utoronto.ca-20060623232720-5cf2f2d1b095395a
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Fri 2006-06-23 19:45:50 -0400
        message:
          Refactor revision_delta call
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060623232720-5cf2f2d1b095395a
        parent: abentley at panoramicfeedback.com-20060623152725-61519496365d39fc
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf2
        timestamp: Fri 2006-06-23 19:27:20 -0400
        message:
          Add log --verbose benchmark
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060625172841-db84e4fa7f50f885
    parent: pqm at pqm.ubuntu.com-20060623181520-082f8258c961b88f
    parent: abentley at panoramicfeedback.com-20060623185828-e3722e7048bc33a4
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-25 18:28:41 +0100
    message:
      Nicer log --forward sorting
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623185828-e3722e7048bc33a4
        parent: abentley at panoramicfeedback.com-20060623185428-cb37cadbbcd06276
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 14:58:28 -0400
        message:
          Tweak rev_nos style
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623185428-cb37cadbbcd06276
        parent: abentley at panoramicfeedback.com-20060623172259-e34bbebf91d9d0f8
        parent: pqm at pqm.ubuntu.com-20060623181520-082f8258c961b88f
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 14:54:28 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623172259-e34bbebf91d9d0f8
        parent: abentley at panoramicfeedback.com-20060623162625-6b87b9ec194d9053
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 13:22:59 -0400
        message:
          Sort revisions at each depth, instead of just mainline revisions.
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623162625-6b87b9ec194d9053
        parent: abentley at panoramicfeedback.com-20060623152725-61519496365d39fc
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 12:26:25 -0400
        message:
          Forward sorting shows merges under mainline revision
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060623181520-082f8258c961b88f
    parent: pqm at pqm.ubuntu.com-20060623180910-c45d7b3db60625f7
    parent: abentley at panoramicfeedback.com-20060622154226-1e219260ed93e452
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-23 19:15:20 +0100
    message:
      Add support for submit location to bundles
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060622154226-1e219260ed93e452
        parent: pqm at pqm.ubuntu.com-20060622122057-232c5c88c5d6bf6d
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: submit-branch
        timestamp: Thu 2006-06-22 11:42:26 -0400
        message:
          Add support for submit location to bundles
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060623180910-c45d7b3db60625f7
    parent: pqm at pqm.ubuntu.com-20060623155016-476962c2dd4938a2
    parent: abentley at panoramicfeedback.com-20060621204144-6a6b715b0f2508a0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-23 19:09:10 +0100
    message:
      Ensure that crlf bundles don't cause path to be treated as branch
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621204144-6a6b715b0f2508a0
        parent: abentley at panoramicfeedback.com-20060621203051-258791fb09456b01
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Wed 2006-06-21 16:41:44 -0400
        message:
          Whitespace/comment fix
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621203051-258791fb09456b01
        parent: abentley at panoramicfeedback.com-20060621152339-e73b18b1ca3d08e2
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Wed 2006-06-21 16:30:51 -0400
        message:
          Don't use assertNotRaises-- instead, catch BadBundle and pass
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621152339-e73b18b1ca3d08e2
        parent: abentley at panoramicfeedback.com-20060621150240-f0e4981af656ddec
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Wed 2006-06-21 11:23:39 -0400
        message:
          Clean up assertNotRaises
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621150240-f0e4981af656ddec
        parent: abentley at panoramicfeedback.com-20060621133730-6f6f965f4d2e3743
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Wed 2006-06-21 11:02:40 -0400
        message:
          Fix reporting of malformed, (especially, crlf) bundles
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060623155016-476962c2dd4938a2
    parent: pqm at pqm.ubuntu.com-20060622200147-08093baa0cf46599
    parent: abentley at panoramicfeedback.com-20060623152725-61519496365d39fc
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-23 16:50:16 +0100
    message:
      Optimize performance of log --short and log --line
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623152725-61519496365d39fc
        parent: abentley at panoramicfeedback.com-20060623142815-a48f3a00b1a14679
        parent: pqm at pqm.ubuntu.com-20060622200147-08093baa0cf46599
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 11:27:25 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623142815-a48f3a00b1a14679
        parent: abentley at panoramicfeedback.com-20060623140705-8f5e6316c7735623
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 10:28:15 -0400
        message:
          Apply review comments
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060623140705-8f5e6316c7735623
        parent: aaron.bentley at utoronto.ca-20060623023729-8bf69d76a70b3b87
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-23 10:07:05 -0400
        message:
          Clean up merge log benchmark
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060623023729-8bf69d76a70b3b87
        parent: aaron.bentley at utoronto.ca-20060623021716-c9b81f6432adf745
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Thu 2006-06-22 22:37:29 -0400
        message:
          Optimize log formats that don't show merges
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060623021716-c9b81f6432adf745
        parent: aaron.bentley at utoronto.ca-20060623004923-1619bc2b4aabae13
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Thu 2006-06-22 22:17:16 -0400
        message:
          Add benchmarks for merged trees
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060623004923-1619bc2b4aabae13
        parent: aaron.bentley at utoronto.ca-20060617215040-1d7f619907d1a627
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Thu 2006-06-22 20:49:23 -0400
        message:
          Factor out the revision list generation
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060622200147-08093baa0cf46599
    parent: pqm at pqm.ubuntu.com-20060622183726-70f1e7cb560cf090
    parent: john at arbash-meinel.com-20060622182425-6f45cb7acd587216
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-22 21:01:47 +0100
    message:
      (jam) fix #49182, ignore trailing whitespace in bundles
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060622182425-6f45cb7acd587216
        parent: john at arbash-meinel.com-20060622173003-ab30e66758adc397
        parent: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-22 13:24:25 -0500
        message:
          [merge] bzr.dev 1804 and fix conflicts.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060622173003-ab30e66758adc397
        parent: john at arbash-meinel.com-20060622171845-b14fa29a005c958a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-22 12:30:03 -0500
        message:
          We now should handle trailing whitespace better (fix #49182).
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060622171845-b14fa29a005c958a
        parent: john at arbash-meinel.com-20060622165533-1711ab80583d7d04
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-22 12:18:45 -0500
        message:
          (failing) add some tests which munge trailing whitespace
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060622165533-1711ab80583d7d04
        parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-22 11:55:33 -0500
        message:
          Clean up the bundle tests a little bit.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060622183726-70f1e7cb560cf090
    parent: pqm at pqm.ubuntu.com-20060622122057-232c5c88c5d6bf6d
    parent: abentley at panoramicfeedback.com-20060621171427-6f56648c1b5ee943
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-22 19:37:26 +0100
    message:
      Update StrictTestament support and as_sha1 algorithm, bump bundle version
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621171427-6f56648c1b5ee943
        parent: abentley at panoramicfeedback.com-20060621142052-b71d1dfea2a7ebe1
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-06-21 13:14:27 -0400
        message:
          Make sure strict testaments indicate when an execute bit is true
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621142052-b71d1dfea2a7ebe1
        parent: aaron.bentley at utoronto.ca-20060620041028-e01c9a8c7cdf31df
        parent: pqm at pqm.ubuntu.com-20060621134553-260d7058a7c44a27
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-06-21 10:20:52 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620041028-e01c9a8c7cdf31df
        parent: aaron.bentley at utoronto.ca-20060620035941-c40e5f1e06de0cfc
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2006-06-20 00:10:28 -0400
        message:
          Fix strict testaments, as_sha1
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620035941-c40e5f1e06de0cfc
        parent: aaron.bentley at utoronto.ca-20060620035311-355370a964fb8354
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2006-06-19 23:59:41 -0400
        message:
          Testament sha1 is the same as in short form (John A. Meinel)
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620035311-355370a964fb8354
        parent: aaron.bentley at utoronto.ca-20060618155341-2e3f94b6cee27b24
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2006-06-19 23:53:11 -0400
        message:
          Implement --strict at commandline, fix up strict format
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060622122057-232c5c88c5d6bf6d
    parent: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
    parent: abentley at panoramicfeedback.com-20060621213506-e58c1f9dc1a6d6d2
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-22 13:20:57 +0100
    message:
      Harmonize branch.conf with bazaar.conf and locations.conf
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621213506-e58c1f9dc1a6d6d2
        parent: abentley at panoramicfeedback.com-20060621210920-e9fadec3d1b10d24
        parent: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: foo
        timestamp: Wed 2006-06-21 17:35:06 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621210920-e9fadec3d1b10d24
        parent: abentley at panoramicfeedback.com-20060621210904-985f2aae62ae90d0
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: foo
        timestamp: Wed 2006-06-21 17:09:20 -0400
        message:
          Deprecated Branch.tree_config
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621210904-985f2aae62ae90d0
        parent: abentley at panoramicfeedback.com-20060621200802-3c2a9b19242c2d6a
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: foo
        timestamp: Wed 2006-06-21 17:09:04 -0400
        message:
          Added test that branch_config can't influence gpg_signing_command
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621200802-3c2a9b19242c2d6a
        parent: abentley at panoramicfeedback.com-20060621192546-acf99aa9a3101354
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: foo
        timestamp: Wed 2006-06-21 16:08:02 -0400
        message:
          Add Branch.get_config, update BranchConfig() callers
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621192546-acf99aa9a3101354
        parent: abentley at panoramicfeedback.com-20060620184001-83a6f4b38c9f15f9
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: foo
        timestamp: Wed 2006-06-21 15:25:46 -0400
        message:
          Add precedence test
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060620184001-83a6f4b38c9f15f9
        parent: abentley at panoramicfeedback.com-20060620181000-e297d286929064bf
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: foo
        timestamp: Tue 2006-06-20 14:40:01 -0400
        message:
          Set/get nickname using BranchConfig
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060620181000-e297d286929064bf
        parent: abentley at panoramicfeedback.com-20060620172736-6b36ad5a6d84239c
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: config
        timestamp: Tue 2006-06-20 14:10:00 -0400
        message:
          Ensure branch.conf works properly
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060620172736-6b36ad5a6d84239c
        parent: abentley at panoramicfeedback.com-20060617190145-c54d21563df3cf29
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: config
        timestamp: Tue 2006-06-20 13:27:36 -0400
        message:
          Integrate branch.conf into BranchConfig
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
    parent: pqm at pqm.ubuntu.com-20060621134553-260d7058a7c44a27
    parent: abentley at panoramicfeedback.com-20060621143057-776e4b8d707e430e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-21 15:55:08 +0100
    message:
      Install benchmarks. (Jelmer Vernooij)
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621143057-776e4b8d707e430e
        parent: abentley at panoramicfeedback.com-20060621142821-6c1170e2d9029f76
        parent: jelmer at samba.org-20060621135414-11a3a70e53adbb99
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's integration
        timestamp: Wed 2006-06-21 10:30:57 -0400
        message:
          Install benchmarks. (Jelmer Vernooij)
            ------------------------------------------------------------
            merged: jelmer at samba.org-20060621135414-11a3a70e53adbb99
            parent: pqm at pqm.ubuntu.com-20060621125550-9c0676b834e80815
            committer: Jelmer Vernooij <jelmer at samba.org>
            branch nick: bzr.dev
            timestamp: Wed 2006-06-21 15:54:14 +0200
            message:
              Install benchmarks.
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621142821-6c1170e2d9029f76
        parent: abentley at panoramicfeedback.com-20060503205044-6234433f38c83157
        parent: pqm at pqm.ubuntu.com-20060621134553-260d7058a7c44a27
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's integration
        timestamp: Wed 2006-06-21 10:28:21 -0400
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060621134553-260d7058a7c44a27
    parent: pqm at pqm.ubuntu.com-20060621125550-9c0676b834e80815
    parent: abentley at panoramicfeedback.com-20060621133730-6f6f965f4d2e3743
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-21 14:45:53 +0100
    message:
      Refactor bundle code
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060621133730-6f6f965f4d2e3743
        parent: aaron.bentley at utoronto.ca-20060620025805-d7df95b0d4ae75ad
        parent: pqm at pqm.ubuntu.com-20060620081038-8eb4543e54b8491c
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Wed 2006-06-21 09:37:30 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620025805-d7df95b0d4ae75ad
        parent: aaron.bentley at utoronto.ca-20060620025347-475a810f578d8862
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bundles
        timestamp: Mon 2006-06-19 22:58:05 -0400
        message:
          Remove header parsing code from BundleReader
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620025347-475a810f578d8862
        parent: aaron.bentley at utoronto.ca-20060620023828-4158d5fd8c0be46a
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bundles
        timestamp: Mon 2006-06-19 22:53:47 -0400
        message:
          Removed get_bundle and revision_tree
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620023828-4158d5fd8c0be46a
        parent: aaron.bentley at utoronto.ca-20060620023224-745f7801d2ef3ac5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bundles
        timestamp: Mon 2006-06-19 22:38:28 -0400
        message:
          Rename read_bundle.py to bundle_data.py
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620023224-745f7801d2ef3ac5
        parent: aaron.bentley at utoronto.ca-20060620011607-f771c3044a87779c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bundles
        timestamp: Mon 2006-06-19 22:32:24 -0400
        message:
          Move BundleReader into v07 serializer
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060620011607-f771c3044a87779c
        parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bundles
        timestamp: Mon 2006-06-19 21:16:07 -0400
        message:
          Move revision_tree into BundleInfo
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060621125550-9c0676b834e80815
    parent: pqm at pqm.ubuntu.com-20060621031459-5f06bd6e74982326
    parent: robertc at robertcollins.net-20060621111311-0e6b92f85d23924d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-21 13:55:50 +0100
    message:
      (robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060621111311-0e6b92f85d23924d
        parent: pqm at pqm.ubuntu.com-20060621031459-5f06bd6e74982326
        parent: robertc at robertcollins.net-20060621103856-ef1326b16e9fb055
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Wed 2006-06-21 21:13:11 +1000
        message:
          (robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060621103856-ef1326b16e9fb055
        parent: pqm at pqm.ubuntu.com-20060619085442-78ad2b3effaba541
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: loom
        timestamp: Wed 2006-06-21 20:38:56 +1000
        message:
          Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060621031459-5f06bd6e74982326
    parent: pqm at pqm.ubuntu.com-20060620081038-8eb4543e54b8491c
    parent: aaron.bentley at utoronto.ca-20060621023340-19364e0e14d66548
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2006-06-21 04:14:59 +0100
    message:
      Hide TTYProgressBars unless they last more than 1 second
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060621023340-19364e0e14d66548
        parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: progress-flicker
        timestamp: Tue 2006-06-20 22:33:40 -0400
        message:
          Hide TTYProgressBars unless they last more than 1 second
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060620081038-8eb4543e54b8491c
    parent: pqm at pqm.ubuntu.com-20060620063849-400861427a3a9ff1
    parent: mbp at sourcefrog.net-20060620075543-b10f6575d4a4fa32
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-20 09:10:38 +0100
    message:
      (mbp) remove Scratch objects
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060620075543-b10f6575d4a4fa32
        parent: mbp at sourcefrog.net-20060606080909-f7c9ea6defe2e751
        parent: pqm at pqm.ubuntu.com-20060620063849-400861427a3a9ff1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.remove-scratch
        timestamp: Tue 2006-06-20 17:55:43 +1000
        message:
          [merge] bzr.dev
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060606080909-f7c9ea6defe2e751
        parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.remove-scratch
        timestamp: Tue 2006-06-06 09:09:09 +0100
        message:
          Remove Scratch objects used by doctests
          
          Some old doctests rely on special Scratch object which clean up
          temporary directory when they're deleted.  This is a bit undesirable
          because deletion is not predictable and the classes aren't used enough
          to be worthwhile.
          
           * Remove ScratchBranch, ScratchDir, ScratchTransport, etc
           * Remove old doctests or convert to unittests
           * Incidental cleanups
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060620063849-400861427a3a9ff1
    parent: pqm at pqm.ubuntu.com-20060620035035-a9a7dc096fed5060
    parent: mbp at sourcefrog.net-20060620053216-817857d7ca3e9d1f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-20 07:38:49 +0100
    message:
      (mbp) pyflakes cleanups
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060620053216-817857d7ca3e9d1f
        parent: mbp at sourcefrog.net-20060620044530-6e8a6f4b6f3bc525
        parent: pqm at pqm.ubuntu.com-20060620035035-a9a7dc096fed5060
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.pyflakes
        timestamp: Tue 2006-06-20 15:32:16 +1000
        message:
          [merge] bzr.dev
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060620044530-6e8a6f4b6f3bc525
        parent: mbp at sourcefrog.net-20060620035711-400bb6b6bc6ff95b
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.pyflakes
        timestamp: Tue 2006-06-20 14:45:30 +1000
        message:
          Cleanup of imports; undeprecate all_revision_ids()
          
          Thanks to John for review comments.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060620035711-400bb6b6bc6ff95b
        parent: pqm at pqm.ubuntu.com-20060615051918-71de1c30c06973fc
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.pyflakes
        timestamp: Tue 2006-06-20 13:57:11 +1000
        message:
          Add pyflakes makefile target; fix many warnings
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060620035035-a9a7dc096fed5060
    parent: pqm at pqm.ubuntu.com-20060620011749-a14183c559028aaf
    parent: mbp at sourcefrog.net-20060620033014-e19ce470e2ce6561
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-20 04:50:35 +0100
    message:
      (mbp) show traceback on stderr on unexpected errors
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060620033014-e19ce470e2ce6561
        parent: mbp at sourcefrog.net-20060620013525-d2eba83a7c6e953b
        parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Tue 2006-06-20 13:30:14 +1000
        message:
          [merge] bzr.dev
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060620013525-d2eba83a7c6e953b
        parent: mbp at sourcefrog.net-20060615054938-5025f2075db2bf14
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Tue 2006-06-20 11:35:25 +1000
        message:
          Review cleanups: better error reporting, put back report_exception. 
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060615054938-5025f2075db2bf14
        parent: mbp at sourcefrog.net-20060615053634-4fd52ba691855659
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Thu 2006-06-15 15:49:38 +1000
        message:
          Add test for formatting of EPIPE
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060615053634-4fd52ba691855659
        parent: mbp at sourcefrog.net-20060604221303-1f902e4ec57868d4
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Thu 2006-06-15 15:36:34 +1000
        message:
          Clean up many exception classes.
          
          Errors indicating a user error are now shown with is_user_error on the
          exception; use this rather than hardcoding a list of exceptions that should be
          handled this way.
          
          Exceptions now inherit from BzrNewException where possible to use consistent
          formatting method.
          
          Remove rather obsolete docstring test on Branch.missing_revisions.
          
          Remove dead code from find_merge_base.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060604221303-1f902e4ec57868d4
        parent: mbp at sourcefrog.net-20060604220458-c97f0352c21a678c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Sun 2006-06-04 23:13:03 +0100
        message:
          Show short form for OSError and IOError too
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060604220458-c97f0352c21a678c
        parent: mbp at sourcefrog.net-20060604220420-6bab3e2b6ebe013e
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Sun 2006-06-04 23:04:58 +0100
        message:
          Don't log bzr version to bzr.log; instead just show when bugged.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060604220420-6bab3e2b6ebe013e
        parent: mbp at sourcefrog.net-20060604214502-a47830087e90a3e1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Sun 2006-06-04 23:04:20 +0100
        message:
          Cleanup more exception-formatting code
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060604214502-a47830087e90a3e1
        parent: mbp at sourcefrog.net-20060604212251-8f5dc15da9189eac
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Sun 2006-06-04 22:45:02 +0100
        message:
          Improved tests for display of exceptions.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060604212251-8f5dc15da9189eac
        parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.traceback
        timestamp: Sun 2006-06-04 22:22:51 +0100
        message:
          When an unhandled exception occurs, write the traceback to stderr.
          
          Also encourage the user to send this to the list.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060620011749-a14183c559028aaf
    parent: pqm at pqm.ubuntu.com-20060620005432-e393f791e07d2cc8
    parent: john at arbash-meinel.com-20060620010414-6046fc4038b56bf0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-20 02:17:49 +0100
    message:
      (jam) misc win32 fixes (#50155), fix bundle merging
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060620010414-6046fc4038b56bf0
        parent: john at arbash-meinel.com-20060619002441-1a4c4d05883a2169
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Mon 2006-06-19 20:04:14 -0500
        message:
          Workaround was not needed, already solved by using get_transport() and catching PathError
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060619002441-1a4c4d05883a2169
        parent: john at arbash-meinel.com-20060618193913-88164e4b8df30cd9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sun 2006-06-18 19:24:41 -0500
        message:
          Restore merging from a local directory by handling EACCES properly on win32
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618193913-88164e4b8df30cd9
        parent: john at arbash-meinel.com-20060618185840-94e61f576c5d7f99
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sun 2006-06-18 14:39:13 -0500
        message:
          Bundles were still using os.path.join to compute paths rather than osutils.pathjoin
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618185840-94e61f576c5d7f99
        parent: john at arbash-meinel.com-20060618185623-854bdd0fbc4f230f
        parent: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sun 2006-06-18 13:58:40 -0500
        message:
          [merge] bzr.dev SFTP fixes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618185623-854bdd0fbc4f230f
        parent: john at arbash-meinel.com-20060618160959-afd0920eb393cb3c
        parent: pqm at pqm.ubuntu.com-20060618053944-9dbfbd1db2c79933
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sun 2006-06-18 13:56:23 -0500
        message:
          [merge] bzr.dev 1790
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618160959-afd0920eb393cb3c
        parent: john at arbash-meinel.com-20060611034017-d9629b49091e2df6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sun 2006-06-18 11:09:59 -0500
        message:
          Add Aaron's --strict testament patch to help with debugging.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611034017-d9629b49091e2df6
        parent: john at arbash-meinel.com-20060611033742-ee98bd12abd089ae
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 22:40:17 -0500
        message:
          Only interpret HTTP paths as utf8 on win32
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611033742-ee98bd12abd089ae
        parent: john at arbash-meinel.com-20060611032330-74baa5055e28de6b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 22:37:42 -0500
        message:
          Custom HttpRequestHandler which treats all paths as utf8 encoded
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611032330-74baa5055e28de6b
        parent: john at arbash-meinel.com-20060611030928-502d4af47bd62fe1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 22:23:30 -0500
        message:
          Use line_endings='binary' for win32
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611030928-502d4af47bd62fe1
        parent: john at arbash-meinel.com-20060611025743-c6532be451a525be
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 22:09:28 -0500
        message:
          Remove cp437 from the set of encodings, it isn't strictly needed
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611025743-c6532be451a525be
        parent: john at arbash-meinel.com-20060611024651-720ff62ba21f9690
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 21:57:43 -0500
        message:
          Skip non_ascii tests that won't write properly to the screen
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611024651-720ff62ba21f9690
        parent: john at arbash-meinel.com-20060611022255-d65cae68762dca6a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 21:46:51 -0500
        message:
          Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611022255-d65cae68762dca6a
        parent: john at arbash-meinel.com-20060611015903-a8bb9a06144e70d1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 21:22:55 -0500
        message:
          In general, python on win32 needs to use the unicode os api, because bytestream stuff just doesn't work.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611015903-a8bb9a06144e70d1
        parent: john at arbash-meinel.com-20060611015702-7313e9016f468377
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 20:59:03 -0500
        message:
          switch to prefering lowercase drive letters, since that matches os.getcwd() drive letters
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611015702-7313e9016f468377
        parent: john at arbash-meinel.com-20060611013811-1e34025ff9fb98af
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 20:57:02 -0500
        message:
          Adding cp437, which is my default encoding on windows
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060611013811-1e34025ff9fb98af
        parent: john at arbash-meinel.com-20060610145351-9da0c1f8ba8a57e0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 20:38:11 -0500
        message:
          Removing hacks for _win32_abspath, on real win32 abspath handles unicode just fine, it doesn't handle encoding into 'mbcs'
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060610145351-9da0c1f8ba8a57e0
        parent: john at arbash-meinel.com-20060610142745-1f86eec922285e65
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 09:53:51 -0500
        message:
          the _posix_* routines should use posixpath not os.path, so tests pass on win32
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060610142745-1f86eec922285e65
        parent: john at arbash-meinel.com-20060610141001-c9fe064ba2f03b34
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 09:27:45 -0500
        message:
          Fix some broken tests because of stupid ntpath.abspath behavior
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060610141001-c9fe064ba2f03b34
        parent: jfmeinel at Ghazal-20060610135801-1ed9433a07de5f6c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 09:10:01 -0500
        message:
          Alexander recommended a better short russian string.
        ------------------------------------------------------------
        merged: jfmeinel at Ghazal-20060610135801-1ed9433a07de5f6c
        parent: john at arbash-meinel.com-20060610134238-b5f70141bc325f26
        committer: jfmeinel <jfmeinel at Ghazal>
        branch nick: win32
        timestamp: Sat 2006-06-10 08:58:01 -0500
        message:
          current python may be running in a path that has a space, so properly quote the python exe name. for test_msgeditor
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060610134238-b5f70141bc325f26
        parent: john at arbash-meinel.com-20060610132724-01a44fdb1f0097b5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: win32
        timestamp: Sat 2006-06-10 08:42:38 -0500
        message:
          del is not an executable program on win32, you must use cmd /c del
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060620005432-e393f791e07d2cc8
    parent: pqm at pqm.ubuntu.com-20060620004729-f8ab8de426df6df7
    parent: john at arbash-meinel.com-20060617185339-2ddc4e4b24c3ddc5
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-20 01:54:32 +0100
    message:
      (jam) fix 'bzr push' so it prints correctly, and only remembers if it connects.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617185339-2ddc4e4b24c3ddc5
        parent: john at arbash-meinel.com-20060617005149-429088726b98891d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix-push
        timestamp: Sat 2006-06-17 13:53:39 -0500
        message:
          Update help for the new --remember semantics.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617005149-429088726b98891d
        parent: john at arbash-meinel.com-20060617004934-7eb765919f2a4de5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix-push
        timestamp: Fri 2006-06-16 19:51:49 -0500
        message:
          NEWS, this fixes bug #49742
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617004934-7eb765919f2a4de5
        parent: john at arbash-meinel.com-20060617003952-52fe0c5994d0cce7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix-push
        timestamp: Fri 2006-06-16 19:49:34 -0500
        message:
          Push should only save the location if it can actually connect (doesn't need to succeed)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617003952-52fe0c5994d0cce7
        parent: pqm at pqm.ubuntu.com-20060616211230-988a8faa0753cf18
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix-push
        timestamp: Fri 2006-06-16 19:39:52 -0500
        message:
          Fix the output of 'bzr push' so that it prints the location correctly.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060620004729-f8ab8de426df6df7
    parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
    parent: john at arbash-meinel.com-20060619144019-873a4a8d252f7896
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-20 01:47:29 +0100
    message:
      (jam) add --profile-imports as a global option to show startup times.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060619144019-873a4a8d252f7896
        parent: john at arbash-meinel.com-20060618045838-820593e919d762a2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Mon 2006-06-19 09:40:19 -0500
        message:
          Refactor import stuff into separate functions. Update news
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618045838-820593e919d762a2
        parent: john at arbash-meinel.com-20060618044838-9ecf14ee3d0a1f18
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 23:58:38 -0500
        message:
          Remove pprint dependency
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618044838-9ecf14ee3d0a1f18
        parent: john at arbash-meinel.com-20060618044313-08d3915d095cb28b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 23:48:38 -0500
        message:
          Default to hiding things that take less that .1ms to keep the output clean.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618044313-08d3915d095cb28b
        parent: john at arbash-meinel.com-20060618043917-6d0009ac9f628ca4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 23:43:13 -0500
        message:
          Remove scope name for now, still log it, in case we need it for demandload.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618043917-6d0009ac9f628ca4
        parent: john at arbash-meinel.com-20060618042827-748cb3f43cca8ae8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 23:39:17 -0500
        message:
          More layout work
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618042827-748cb3f43cca8ae8
        parent: john at arbash-meinel.com-20060618041637-2e95a1469edd8c72
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 23:28:27 -0500
        message:
          change layout to be easier to mentally parse.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618041637-2e95a1469edd8c72
        parent: john at arbash-meinel.com-20060618022847-abd388b959fcf72e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 23:16:37 -0500
        message:
          New --profile-imports output which puts parents before children.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618022847-abd388b959fcf72e
        parent: john at arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 21:28:47 -0500
        message:
          It seems you cannot override __builtins__.__import__ in a sub-module.
          
          Clean up module so that it makes more sense as an import.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
        parent: john at arbash-meinel.com-20060618021105-09b7a652b4fe653c
        parent: pqm at pqm.ubuntu.com-20060617190945-49d8ba41828060f5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 21:21:57 -0500
        message:
          [merge] bzr.dev 1787
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618021105-09b7a652b4fe653c
        parent: john at arbash-meinel.com-20060618020512-fda8734b5131f469
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 21:11:05 -0500
        message:
          Update NEWS
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060618020512-fda8734b5131f469
        parent: john at arbash-meinel.com-20060522204638-a0e6ac825a237363
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Sat 2006-06-17 21:05:12 -0500
        message:
          Move the custom importers into a separate module
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060522204638-a0e6ac825a237363
        parent: john at arbash-meinel.com-20060522194849-f8ba14f500258f20
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Mon 2006-05-22 15:46:38 -0500
        message:
          Print out ms rather than seconds
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060522194849-f8ba14f500258f20
        parent: john at arbash-meinel.com-20060522191925-943947550b2a0a2d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Mon 2006-05-22 14:48:49 -0500
        message:
          Adding a profiling for re.compile() as part of --profile-imports
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060522191925-943947550b2a0a2d
        parent: pqm at pqm.ubuntu.com-20060522145312-94c3c934d7cbd9ff
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: profile-import
        timestamp: Mon 2006-05-22 14:19:25 -0500
        message:
          adding --profile-imports to a stock bzr.dev tree
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
    parent: pqm at pqm.ubuntu.com-20060619085442-78ad2b3effaba541
    parent: abentley at panoramicfeedback.com-20060619194846-dfc4bfa8a1182bd1
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-19 20:57:06 +0100
    message:
      Add advice on skipping tests to HACKING
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060619194846-dfc4bfa8a1182bd1
        parent: aaron.bentley at utoronto.ca-20060618155341-2e3f94b6cee27b24
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2006-06-19 15:48:46 -0400
        message:
          Add advice on skipping tests to HACKING
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060619085442-78ad2b3effaba541
    parent: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
    parent: michael at ellerman.id.au-20060618232130-6723c407d86a957b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-19 09:54:42 +0100
    message:
      (mpe) show plugin name in help; ancestry takes branch argument
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060618232130-6723c407d86a957b
        parent: michael at ellerman.id.au-20060618231923-8a362933a83c8660
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Mon 2006-06-19 09:21:30 +1000
        message:
          Fix phase handling in fetch code.
          
          Add a missing "next_phase()" in the fetch code, and call it "Fetch phase"
          not "fetch phase" to match other phases such as Merge/Build etc.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060618231923-8a362933a83c8660
        parent: michael at ellerman.id.au-20060615044007-c2e43776834241a8
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Mon 2006-06-19 09:19:23 +1000
        message:
          Show which plugin (if any) provides a command.
          
          Changes 'bzr help <foo>' and 'bzr help commands', to show which plugin
          provides a command. If the command is a builtin the output is unchanged.
          Tests included. Based on an original patch by Robert Widhopf-Fenk.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060615044007-c2e43776834241a8
        parent: michael at ellerman.id.au-20060606141136-c4e0263d5662a197
        parent: pqm at pqm.ubuntu.com-20060615033738-b8eca7ad18b0dd9c
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Thu 2006-06-15 14:40:07 +1000
        message:
          Merge bzr.dev, fix minor conflict in cmd_revision_history().
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060606141136-c4e0263d5662a197
        parent: michael at ellerman.id.au-20060531084429-35e5429abda9f560
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Wed 2006-06-07 00:11:36 +1000
        message:
          Don't coallesce try blocks, it can lead to confusing exceptions.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060531084429-35e5429abda9f560
        parent: michael at ellerman.id.au-20060530150334-1729470bccee74ee
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Wed 2006-05-31 18:44:29 +1000
        message:
          Add optional location to ancestry and fix behaviour for checkouts.
          
          This adds an optional location parameter to the ancestry command. It also
          changes the behaviour of ancestry on checkouts such that if they have
          been created with a subset of the branch history, only the subset is
          shown by 'bzr ancestry'. Tests for all of that as well.
        ------------------------------------------------------------
        merged: michael at ellerman.id.au-20060530150334-1729470bccee74ee
        parent: pqm at pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
        committer: Michael Ellerman <michael at ellerman.id.au>
        branch nick: mpe
        timestamp: Wed 2006-05-31 01:03:34 +1000
        message:
          Add an optional location parameter to the 'revision-history' command.
          
          Add tests for revision history against regular and repository branches,
          as well as checkouts and lightweight checkouts for completeness.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060618160241-5b3082bb8de0192a
    parent: pqm at pqm.ubuntu.com-20060618053944-9dbfbd1db2c79933
    parent: aaron.bentley at utoronto.ca-20060618155341-2e3f94b6cee27b24
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-18 17:02:41 +0100
    message:
      Handle multiple SFTP connections, fix 5-second delay
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060618155341-2e3f94b6cee27b24
        parent: aaron.bentley at utoronto.ca-20060618155058-3a3301d0be1298d6
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2006-06-18 11:53:41 -0400
        message:
          Wrapped long lines in Robey's patch
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060618155058-3a3301d0be1298d6
        parent: aaron.bentley at utoronto.ca-20060618034505-b3ddac81da07b642
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2006-06-18 11:50:58 -0400
        message:
          Apply Robey Pointer's listener patch
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060618053944-9dbfbd1db2c79933
    parent: pqm at pqm.ubuntu.com-20060618035337-38acf1cda885d83c
    parent: abentley at panoramicfeedback.com-20060616222903-11cbab3e10501076
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-18 06:39:44 +0100
    message:
      Use parent branch as default base branch
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060616222903-11cbab3e10501076
        parent: abentley at panoramicfeedback.com-20060610221345-b540e12c9702ad8f
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Fri 2006-06-16 18:29:03 -0400
        message:
          Use parent branch as default base branch
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060618035337-38acf1cda885d83c
    parent: pqm at pqm.ubuntu.com-20060618032246-5be492b564b839d5
    parent: aaron.bentley at utoronto.ca-20060618034505-b3ddac81da07b642
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-18 04:53:37 +0100
    message:
      Move doctest import to increase speed
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060618034505-b3ddac81da07b642
        parent: aaron.bentley at utoronto.ca-20060618033950-e793fc83dcb2734b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sat 2006-06-17 23:45:05 -0400
        message:
          Move doctest import to increase speed
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060618033950-e793fc83dcb2734b
        parent: aaron.bentley at utoronto.ca-20060618033638-46d14ecce0906a7e
        parent: pqm at pqm.ubuntu.com-20060618032246-5be492b564b839d5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sat 2006-06-17 23:39:50 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060618033638-46d14ecce0906a7e
        parent: abentley at panoramicfeedback.com-20060615213047-0154a3f7967d750b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Sat 2006-06-17 23:36:38 -0400
        message:
          Revert --debris/--detritus changes
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060615213047-0154a3f7967d750b
        parent: abentley at panoramicfeedback.com-20060615180328-36042f50f7a41318
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2006-06-15 17:30:47 -0400
        message:
          Accept classifiers for all tree types, more tests
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060615180328-36042f50f7a41318
        parent: abentley at panoramicfeedback.com-20060615175306-9fb51a0bc2e3aaf5
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2006-06-15 14:03:28 -0400
        message:
          Rename detritus -> debris, make list_files take a lisf of classifiers
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060615175306-9fb51a0bc2e3aaf5
        parent: aaron.bentley at utoronto.ca-20060607190330-f64d39f4b5122389
        parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2006-06-15 13:53:06 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060607190330-f64d39f4b5122389
        parent: aaron.bentley at utoronto.ca-20060607165526-ddde1b66c1985353
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2006-06-07 20:03:30 +0100
        message:
          Add support for --detritus to ls
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060618032246-5be492b564b839d5
    parent: pqm at pqm.ubuntu.com-20060617190945-49d8ba41828060f5
    parent: aaron.bentley at utoronto.ca-20060617215040-1d7f619907d1a627
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-18 04:22:46 +0100
    message:
      Implement get_revisions efficiently, optimize log for screenfuls of text
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617215040-1d7f619907d1a627
        parent: aaron.bentley at utoronto.ca-20060617184405-ba00b55631c7da57
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 17:50:40 -0400
        message:
          Fixes suggested by John Meinel
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617184405-ba00b55631c7da57
        parent: aaron.bentley at utoronto.ca-20060617183730-7842c1e5558d2078
        parent: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 14:44:05 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617183730-7842c1e5558d2078
        parent: aaron.bentley at utoronto.ca-20060617183424-04ba68139b73c965
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 14:37:30 -0400
        message:
          Fix up benchmark comments
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617183424-04ba68139b73c965
        parent: aaron.bentley at utoronto.ca-20060617171250-c2dac00940511ec1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 14:34:24 -0400
        message:
          Add benchmarks for the log commands
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617171250-c2dac00940511ec1
        parent: aaron.bentley at utoronto.ca-20060617165047-7ba91afa72f0c67a
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 13:12:50 -0400
        message:
          Used scaled iterator to retrive revisions
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617165047-7ba91afa72f0c67a
        parent: aaron.bentley at utoronto.ca-20060617163109-989fe1cd7795a422
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 12:50:47 -0400
        message:
          Add screenful benchmark for the short log formatter
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617163109-989fe1cd7795a422
        parent: aaron.bentley at utoronto.ca-20060617160043-954f4c342c9ae26b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 12:31:09 -0400
        message:
          Add screenful benchmark for the line log formatter
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617160043-954f4c342c9ae26b
        parent: aaron.bentley at utoronto.ca-20060617155857-e8558a8eee1ba2c0
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 12:00:43 -0400
        message:
          Use cStringIO to reduce benchmark noise
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060617155857-e8558a8eee1ba2c0
        parent: abentley at panoramicfeedback.com-20060617034235-1492e682acc3231d
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-17 11:58:57 -0400
        message:
          Benchmark the time to display a screenful of log
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060617034235-1492e682acc3231d
        parent: abentley at panoramicfeedback.com-20060617024814-3ea572ee1b5899ca
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-16 23:42:35 -0400
        message:
          Implement get_line_list, cleanups
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060617024814-3ea572ee1b5899ca
        parent: abentley at panoramicfeedback.com-20060617022600-4ab09b864dcd6e70
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-16 22:48:14 -0400
        message:
          Implement get_text in terms of get_texts
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060617022600-4ab09b864dcd6e70
        parent: abentley at panoramicfeedback.com-20060617013226-f692d197afb5a99d
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-16 22:26:00 -0400
        message:
          Sort the needed records before readv
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060617013226-f692d197afb5a99d
        parent: abentley at panoramicfeedback.com-20060616232934-254010708ba9406d
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-16 21:32:26 -0400
        message:
          Reduced read_records calls to 1
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060616232934-254010708ba9406d
        parent: abentley at panoramicfeedback.com-20060616231621-85cd4c166ad1af61
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-16 19:29:34 -0400
        message:
          Clean up use of base knit a bit
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060616231621-85cd4c166ad1af61
        parent: abentley at panoramicfeedback.com-20060615202048-fcee4d87e363a002
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Fri 2006-06-16 19:16:21 -0400
        message:
          Remove debug code
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060615202048-fcee4d87e363a002
        parent: abentley at panoramicfeedback.com-20060612211737-43ac00ac632f27fe
        parent: pqm at pqm.ubuntu.com-20060615181933-dbc6e26a736493e3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Thu 2006-06-15 16:20:48 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060612211737-43ac00ac632f27fe
        parent: abentley at panoramicfeedback.com-20060612202504-dfccecc2af051ea6
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Mon 2006-06-12 17:17:37 -0400
        message:
          Implement get_texts
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060617190945-49d8ba41828060f5
    parent: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
    parent: abentley at panoramicfeedback.com-20060617190145-c54d21563df3cf29
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-06-17 20:09:45 +0100
    message:
      Rename branches.conf to locations.conf
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060617190145-c54d21563df3cf29
        parent: abentley at panoramicfeedback.com-20060617190115-81ab9bbc7aebcf8a
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: config
        timestamp: Sat 2006-06-17 15:01:45 -0400
        message:
          Add credit to NEWS entry
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060617190115-81ab9bbc7aebcf8a
        parent: abentley at panoramicfeedback.com-20060616155924-893f31f8078a90df
        parent: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: config
        timestamp: Sat 2006-06-17 15:01:15 -0400
        message:
          Merge from dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060616155924-893f31f8078a90df
        parent: abentley at panoramicfeedback.com-20060614194557-6b499aa1cf03f7e6
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: config
        timestamp: Fri 2006-06-16 11:59:24 -0400
        message:
          Rename branches.conf to locations.conf
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
    parent: pqm at pqm.ubuntu.com-20060616211230-988a8faa0753cf18
    parent: john at arbash-meinel.com-20060617011815-9139c00d8b51e54b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2006-06-17 03:18:48 +0100
    message:
      (jamesh, jam) fix external_diff to support any file-like object (#4047, #48914)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617011815-9139c00d8b51e54b
        parent: john at arbash-meinel.com-20060617011313-d7db423ff0485c31
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 20:18:15 -0500
        message:
          Use osutils.pumpfile so we don't have to buffer everything in ram
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617011313-d7db423ff0485c31
        parent: john at arbash-meinel.com-20060617010457-46c340d4ad593550
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 20:13:13 -0500
        message:
          Allow external diff to write to a file without a fileno.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060617010457-46c340d4ad593550
        parent: john at arbash-meinel.com-20060616235037-6c15c8f6aa4604ef
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 20:04:57 -0500
        message:
          Raise NoDiff if 'diff' not present.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616235037-6c15c8f6aa4604ef
        parent: john at arbash-meinel.com-20060616234311-6d99ad31c37c92d8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 18:50:37 -0500
        message:
          Update news to mention fix of bugs #4047, #48914
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616234311-6d99ad31c37c92d8
        parent: john at arbash-meinel.com-20060616232206-e6e327272d8cab33
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 18:43:11 -0500
        message:
          Use mkstemp instead of NamedTemporary file for external diff.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616232206-e6e327272d8cab33
        parent: john at arbash-meinel.com-20060616183754-c15966cd121fca69
        parent: james.henstridge at canonical.com-20060612151723-9957f7e258567856
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 18:22:06 -0500
        message:
          [merge] James Henstridge bzr.smallfixes: allow redirecting external_diff to non stdout
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060612151723-9957f7e258567856
        parent: james.henstridge at canonical.com-20060608154126-37cfdf7f42c36e22
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Mon 2006-06-12 23:17:23 +0800
        message:
          changes suggested by John Meinel
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060608154126-37cfdf7f42c36e22
        parent: james.henstridge at canonical.com-20060607045210-18864dfc0536991a
        parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Thu 2006-06-08 23:41:26 +0800
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060607045210-18864dfc0536991a
        parent: james.henstridge at canonical.com-20060505073920-b9a7c8914399eb63
        parent: pqm at pqm.ubuntu.com-20060606231709-6d3f204cbe17b4c6
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Wed 2006-06-07 12:52:10 +0800
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060505073920-b9a7c8914399eb63
        parent: james.henstridge at canonical.com-20060504055129-db17482da5662d69
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Fri 2006-05-05 15:39:20 +0800
        message:
          move external_diff imports to top of file
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060504055129-db17482da5662d69
        parent: james.henstridge at canonical.com-20060503153352-8eb15d278c909d52
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Thu 2006-05-04 13:51:29 +0800
        message:
          remove unneeded import in test
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060503153352-8eb15d278c909d52
        parent: james.henstridge at canonical.com-20060503151902-d031eacbc6c42548
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Wed 2006-05-03 23:33:52 +0800
        message:
          add a test for sending external diff output to a file
        ------------------------------------------------------------
        merged: james.henstridge at canonical.com-20060503151902-d031eacbc6c42548
        parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
        committer: James Henstridge <james.henstridge at canonical.com>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Wed 2006-05-03 23:19:02 +0800
        message:
          add support for redirecting external diff output to a file descriptor
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616211230-988a8faa0753cf18
    parent: pqm at pqm.ubuntu.com-20060616195510-99f53d52da967571
    parent: john at arbash-meinel.com-20060616210503-3d6f8d1e9a6ca5b4
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 22:12:30 +0100
    message:
      (jam) Allow bundles to be 'pull'ed, and accessed over Transports.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616210503-3d6f8d1e9a6ca5b4
        parent: john at arbash-meinel.com-20060616205604-93c2b18476ca09c3
        parent: pqm at pqm.ubuntu.com-20060616195510-99f53d52da967571
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Fri 2006-06-16 16:05:03 -0500
        message:
          [merge] bzr.dev 1784, fix NEWS conflict.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616205604-93c2b18476ca09c3
        parent: john at arbash-meinel.com-20060615225105-76036f35e8616466
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Fri 2006-06-16 15:56:04 -0500
        message:
          Add NEWS entry for bundles.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615225105-76036f35e8616466
        parent: john at arbash-meinel.com-20060615212447-4b020da02cfdce37
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-15 17:51:05 -0500
        message:
          Allow pull to use a bundle as a target,
          fix the merge code to work again.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615212447-4b020da02cfdce37
        parent: john at arbash-meinel.com-20060615211620-9d2f0dc44a297f1a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-15 16:24:47 -0500
        message:
          Add the read_bundle_from_url command, which handles lots of exceptions
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615211620-9d2f0dc44a297f1a
        parent: john at arbash-meinel.com-20060615210712-534faad57d5998eb
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: bundle-fixes
        timestamp: Thu 2006-06-15 16:16:20 -0500
        message:
          opening a dir instead of a file raises an IOError, not OSError
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616195510-99f53d52da967571
    parent: pqm at pqm.ubuntu.com-20060616191533-cfb067b11e06305b
    parent: jelmer at samba.org-20060615230840-f5b75b4927a7f44a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 20:55:10 +0100
    message:
      (jrydberg, jelmer) Change Branch.get_revision_delta() to use Repository.get_revision_delta()
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060615230840-f5b75b4927a7f44a
        parent: jelmer at samba.org-20060613190119-b14fe5e2b5721605
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.jelmer.integration
        timestamp: Fri 2006-06-16 01:08:40 +0200
        message:
          Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060613190119-b14fe5e2b5721605
        parent: jelmer at samba.org-20060613184722-d7c25b21f6541ce5
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.jelmer.integration
        timestamp: Tue 2006-06-13 21:01:19 +0200
        message:
          Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060613184722-d7c25b21f6541ce5
        parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
        parent: jrydberg at gnu.org-20060613183622-4927812ac8194448
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.jelmer.integration
        timestamp: Tue 2006-06-13 20:47:22 +0200
        message:
          Merge jrydbergs get_revision_delta() fixes.
        ------------------------------------------------------------
        merged: jrydberg at gnu.org-20060613183622-4927812ac8194448
        parent: jrydberg at gnu.org-20060613114427-49c897150f86d0ae
        parent: jrydberg at gnu.org-20060607190550-2aa728a6aa78e077
        committer: Johan Rydberg <jrydberg at gnu.org>
        branch nick: bzr.jrydberg.integration
        timestamp: Tue 2006-06-13 20:36:22 +0200
        message:
          Merge bzr.jrydberg.delta
        ------------------------------------------------------------
        merged: jrydberg at gnu.org-20060607190550-2aa728a6aa78e077
        parent: jrydberg at gnu.org-20060606223431-7cb52cd341b6e3aa
        committer: Johan Rydberg <jrydberg at gnu.org>
        branch nick: bzr.jrydberg.delta
        timestamp: Wed 2006-06-07 21:05:50 +0200
        message:
          Add get_revision_delta to Repository; and make Branch.get_revision_delta use it.
        ------------------------------------------------------------
        merged: jrydberg at gnu.org-20060606223431-7cb52cd341b6e3aa
        parent: pqm at pqm.ubuntu.com-20060606161247-44efd292c9de0005
        committer: Johan Rydberg <jrydberg at gnu.org>
        branch nick: bzr.jrydberg.delta
        timestamp: Wed 2006-06-07 00:34:31 +0200
        message:
          Give a revision-id to get_revision_delta.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616191533-cfb067b11e06305b
    parent: pqm at pqm.ubuntu.com-20060616183539-df942cdc7412bfe2
    parent: john at arbash-meinel.com-20060616183754-c15966cd121fca69
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 20:15:33 +0100
    message:
      (matthew fuller) fixes for tutorial.txt
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616183754-c15966cd121fca69
        parent: john at arbash-meinel.com-20060616170147-fc708fe9fb5b8d61
        parent: fullermd at over-yonder.net-20060604231814-b1f6d13f3d27b579
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 13:37:54 -0500
        message:
          [merge] Matthew Fuller: fix up tutorial.txt a bit
        ------------------------------------------------------------
        merged: fullermd at over-yonder.net-20060604231814-b1f6d13f3d27b579
        parent: fullermd at over-yonder.net-20060604231748-2174577737d7fbf6
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: bzr.fullermd
        timestamp: Sun 2006-06-04 18:18:14 -0500
        message:
          bzrtools calls its rsync bit 'rspush' now.
        ------------------------------------------------------------
        merged: fullermd at over-yonder.net-20060604231748-2174577737d7fbf6
        parent: pqm at pqm.ubuntu.com-20060604105531-0071ce43b2156b7a
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: bzr.fullermd
        timestamp: Sun 2006-06-04 18:17:48 -0500
        message:
          Make status output actually look like status output.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616183539-df942cdc7412bfe2
    parent: pqm at pqm.ubuntu.com-20060616182913-d8dc0e4491aaa253
    parent: john at arbash-meinel.com-20060616170147-fc708fe9fb5b8d61
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 19:35:39 +0100
    message:
      (jelmer) Import BzrCheckError in branch.py
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060616170147-fc708fe9fb5b8d61
        parent: john at arbash-meinel.com-20060615215428-ec45e1eb0d8ccf72
        parent: jelmer at samba.org-20060613153241-31e736acdb7f98c7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-16 12:01:47 -0500
        message:
          [merge] Jelmer Vernooij: import BzrCheckError in branch.py
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060613153241-31e736acdb7f98c7
        parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: integration
        timestamp: Tue 2006-06-13 17:32:41 +0200
        message:
          Fix missing import of BzrCheckError.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616182913-d8dc0e4491aaa253
    parent: pqm at pqm.ubuntu.com-20060616161029-6e8fbba7b83a5c5d
    parent: robertc at robertcollins.net-20060616171052-dc65d70ddff25ff6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 19:29:13 +0100
    message:
      (robertc, j-a-meinel)Implement a sort key and comparison routine for the walkdirs prefix-order path output.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616171052-dc65d70ddff25ff6
        parent: robertc at robertcollins.net-20060616162847-57a5dc75b223506b
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sat 2006-06-17 03:10:52 +1000
        message:
          (robertc)Partial refactoring of info tests to be more robust to format changes.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616162847-57a5dc75b223506b
        parent: pqm at pqm.ubuntu.com-20060616161029-6e8fbba7b83a5c5d
        parent: robertc at robertcollins.net-20060616161740-35004ca04a864e3a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sat 2006-06-17 02:28:47 +1000
        message:
          (robertc, j-a-meinel)Implement a sort key and comparison routine for the walkdirs prefix-order path output.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616161740-35004ca04a864e3a
        parent: robertc at robertcollins.net-20060616155924-b8a6591d32f8ab20
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: walkdirs
        timestamp: Sat 2006-06-17 02:17:40 +1000
        message:
          Add new tests John Meinel asked for.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616155924-b8a6591d32f8ab20
        parent: robertc at robertcollins.net-20060615204903-994181bbe8cd4ec1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: walkdirs
        timestamp: Sat 2006-06-17 01:59:24 +1000
        message:
          New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060615204903-994181bbe8cd4ec1
        parent: robertc at robertcollins.net-20060615172625-a81c2730c2c22f18
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: walkdirs
        timestamp: Fri 2006-06-16 06:49:03 +1000
        message:
          Add path_prefix_key and compare_paths_prefix_order utility functions.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616161029-6e8fbba7b83a5c5d
    parent: pqm at pqm.ubuntu.com-20060616155716-59b745c6e778fb4e
    parent: john at arbash-meinel.com-20060615215428-ec45e1eb0d8ccf72
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 17:10:29 +0100
    message:
      (jam) Fixes for urlutils.join() and get_parent() compatibility
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615215428-ec45e1eb0d8ccf72
        parent: john at arbash-meinel.com-20060615210712-534faad57d5998eb
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-15 16:54:28 -0500
        message:
          Remove redundant test.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615210712-534faad57d5998eb
        parent: john at arbash-meinel.com-20060615205744-40167720ab00166b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-15 16:07:12 -0500
        message:
          urlutils.join should work for root paths.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615205744-40167720ab00166b
        parent: john at arbash-meinel.com-20060615191655-0bd4711b4a7a3e76
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-15 15:57:44 -0500
        message:
          fix a typo in bzrlib/branch
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615191655-0bd4711b4a7a3e76
        parent: john at arbash-meinel.com-20060615191350-74d834d6bcd9a919
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-15 14:16:55 -0500
        message:
          The old parent format was utf8
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615191350-74d834d6bcd9a919
        parent: john at arbash-meinel.com-20060615180502-0294d6ef02c0c087
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-15 14:13:50 -0500
        message:
          Allow backwards compatibility with absolute local paths in parent
          Fix up tests to use assertEqual(expected, measured)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615180502-0294d6ef02c0c087
        parent: john at arbash-meinel.com-20060615015802-c60e7bff5e5c71a2
        parent: pqm at pqm.ubuntu.com-20060615173615-77c08b4002e2ea97
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2006-06-15 13:05:02 -0500
        message:
          [merge] bzr.dev 1775
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616155716-59b745c6e778fb4e
    parent: pqm at pqm.ubuntu.com-20060616154716-fd2b9d1896d25324
    parent: robertc at robertcollins.net-20060616155007-952bb7014e00093c
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 16:57:16 +0100
    message:
      (robertc,abentley)Teach all trees about unknowns, conflicts and get_parent_ids.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616155007-952bb7014e00093c
        parent: robertc at robertcollins.net-20060616154020-aff002ca470b7526
        parent: robertc at robertcollins.net-20060616152515-961fbde13f8a3527
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sat 2006-06-17 01:50:07 +1000
        message:
          (robertc,abentley)Teach all trees about unknowns, conflicts and get_parent_ids.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616152515-961fbde13f8a3527
        parent: robertc at robertcollins.net-20060615172625-a81c2730c2c22f18
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree
        timestamp: Sat 2006-06-17 01:25:15 +1000
        message:
          Teach all trees about unknowns, conflicts and get_parent_ids.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616154716-fd2b9d1896d25324
    parent: pqm at pqm.ubuntu.com-20060616143342-8f7f4a4f77c1e4c8
    parent: robertc at robertcollins.net-20060616154020-aff002ca470b7526
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 16:47:16 +0100
    message:
      (robertc)Remove --all option from status and deprecate the underlying api.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616154020-aff002ca470b7526
        parent: pqm at pqm.ubuntu.com-20060616143342-8f7f4a4f77c1e4c8
        parent: robertc at robertcollins.net-20060616101834-4b24ecc948448c41
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sat 2006-06-17 01:40:20 +1000
        message:
          (robertc)Remove --all option from status and deprecate the underlying api.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060616101834-4b24ecc948448c41
        parent: robertc at robertcollins.net-20060615172625-a81c2730c2c22f18
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status
        timestamp: Fri 2006-06-16 20:18:34 +1000
        message:
          Remove --all option from status.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060616143342-8f7f4a4f77c1e4c8
    parent: pqm at pqm.ubuntu.com-20060615181933-dbc6e26a736493e3
    parent: abentley at panoramicfeedback.com-20060614194557-6b499aa1cf03f7e6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-16 15:33:42 +0100
    message:
      Use create_signature for signing policy, deprecate check_signatures for this
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060614194557-6b499aa1cf03f7e6
        parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: config
        timestamp: Wed 2006-06-14 15:45:57 -0400
        message:
          Use create_signature for signing policy, deprecate check_signatures for this
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060615181933-dbc6e26a736493e3
    parent: pqm at pqm.ubuntu.com-20060615173615-77c08b4002e2ea97
    parent: abentley at panoramicfeedback.com-20060615181151-acf8874f578e53d1
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-15 19:19:33 +0100
    message:
      Add get_revisions to repositories
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060615181151-acf8874f578e53d1
        parent: abentley at panoramicfeedback.com-20060612202504-dfccecc2af051ea6
        parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf.submit
        timestamp: Thu 2006-06-15 14:11:51 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060612202504-dfccecc2af051ea6
        parent: aaron.bentley at utoronto.ca-20060612020737-0937148efaaebde1
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: log.perf
        timestamp: Mon 2006-06-12 16:25:04 -0400
        message:
          Revert locking fix
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060612020737-0937148efaaebde1
        parent: aaron.bentley at utoronto.ca-20060611215648-fa08bdb6ea06ee89
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sun 2006-06-11 22:07:37 -0400
        message:
          Test get_revisions with all repository types (and fix bug...)
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060611215648-fa08bdb6ea06ee89
        parent: aaron.bentley at utoronto.ca-20060611214637-3a88d0f47f40f77e
        parent: pqm at pqm.ubuntu.com-20060611213609-113d9fc9c0f8edfc
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sun 2006-06-11 17:56:48 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060611214637-3a88d0f47f40f77e
        parent: aaron.bentley at utoronto.ca-20060610142239-7c75c4e0dc2814b3
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sun 2006-06-11 17:46:37 -0400
        message:
          Add log benchmark
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060610142239-7c75c4e0dc2814b3
        parent: aaron.bentley at utoronto.ca-20060609132040-1b5e7b48d629454b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Sat 2006-06-10 10:22:39 -0400
        message:
          Show logs using get_revisions
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060609132040-1b5e7b48d629454b
        parent: pqm at pqm.ubuntu.com-20060609075734-40a4d9653d67f2b9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: log.perf
        timestamp: Fri 2006-06-09 14:20:40 +0100
        message:
          Ensure show_log takes a repository read lock for the duration
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060615173615-77c08b4002e2ea97
    parent: pqm at pqm.ubuntu.com-20060615173026-2d88f52257ef1aad
    parent: robertc at robertcollins.net-20060615172625-a81c2730c2c22f18
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-15 18:36:15 +0100
    message:
      (robertc)Teach WorkingTree.commit to return the committed revision id.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060615172625-a81c2730c2c22f18
        parent: pqm at pqm.ubuntu.com-20060615051918-71de1c30c06973fc
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit
        timestamp: Fri 2006-06-16 03:26:25 +1000
        message:
          Teach WorkingTree.commit to return the committed revision id.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060615173026-2d88f52257ef1aad
    parent: pqm at pqm.ubuntu.com-20060615051918-71de1c30c06973fc
    parent: john at arbash-meinel.com-20060615015802-c60e7bff5e5c71a2
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-15 18:30:26 +0100
    message:
      (jam) A few small win32 and sftp fixes.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615015802-c60e7bff5e5c71a2
        parent: john at arbash-meinel.com-20060615014655-7a0f8883d7e89785
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-14 20:58:02 -0500
        message:
          Factor out another win32 special case and add platform independent tests for it.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060615014655-7a0f8883d7e89785
        parent: john at arbash-meinel.com-20060612143927-2498b59be508da09
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2006-06-14 20:46:55 -0500
        message:
          Split out win32 specific code so that it can be tested on all platforms.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060612143927-2498b59be508da09
        parent: john at arbash-meinel.com-20060612142333-1bf1c2828fc9a012
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Mon 2006-06-12 09:39:27 -0500
        message:
          enable bogus_url support for SFTP tests
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060612142333-1bf1c2828fc9a012
        parent: john at arbash-meinel.com-20060610132724-01a44fdb1f0097b5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Mon 2006-06-12 09:23:33 -0500
        message:
          [patch] Lukáš Lalinský: (#49363) fix TypeError in sftp when trying to raise ConnectionError (modified by jam)
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060615051918-71de1c30c06973fc
    parent: pqm at pqm.ubuntu.com-20060615043022-c2f1b7cf26f6c5c0
    parent: mbp at sourcefrog.net-20060615045634-dad8a3f98d0db70b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-15 06:19:18 +0100
    message:
      (mbp) fix imports of fallback elementtree
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060615045634-dad8a3f98d0db70b
        parent: pqm at pqm.ubuntu.com-20060615043022-c2f1b7cf26f6c5c0
        committer: mbp at sourcefrog.net
        branch nick: bzr.mbp.smallfixes
        timestamp: Thu 2006-06-15 14:56:34 +1000
        message:
          Fix up loading of fallback ElementTree
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060615043022-c2f1b7cf26f6c5c0
    parent: pqm at pqm.ubuntu.com-20060615033738-b8eca7ad18b0dd9c
    parent: bialix at ukr.net-20060613191210-ffa45d129f95f96a
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-15 05:30:22 +0100
    message:
      (Alexander Belchenko) win32 fixes for TestInfo
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060613191210-ffa45d129f95f96a
        parent: bialix at ukr.net-20060613190622-dd5ad9c388cddf4a
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bzr.dev.show-bound-info
        timestamp: Tue 2006-06-13 22:12:10 +0300
        message:
          Test blackbox.test_info.TestInfo.test_info_locking_oslocks skipped on win32
        ------------------------------------------------------------
        merged: bialix at ukr.net-20060613190622-dd5ad9c388cddf4a
        parent: pqm at pqm.ubuntu.com-20060613130303-e9de5dbda2e80da6
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bzr.dev.show-bound-info
        timestamp: Tue 2006-06-13 22:06:22 +0300
        message:
          win32 fix for blackbox.test_info.TestInfo.test_info_non_existing
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060615033738-b8eca7ad18b0dd9c
    parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
    parent: aaron.bentley at utoronto.ca-20060615031051-94c53f386edc1f8c
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2006-06-15 04:37:38 +0100
    message:
      Ignore lines that start with '#' in patch parser
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060615031051-94c53f386edc1f8c
        parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ab2
        timestamp: Wed 2006-06-14 23:10:51 -0400
        message:
          Ignore lines that start with '#' in patch parser
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
    parent: pqm at pqm.ubuntu.com-20060613130303-e9de5dbda2e80da6
    parent: robertc at robertcollins.net-20060613162609-779ae11bd22b2866
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-13 18:02:41 +0100
    message:
      (robertc, jelmer)Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij)
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060613162609-779ae11bd22b2866
        parent: pqm at pqm.ubuntu.com-20060613130303-e9de5dbda2e80da6
        parent: jelmer at samba.org-20060613150406-fb8b663191b0bd2a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Wed 2006-06-14 02:26:09 +1000
        message:
          Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij)
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060613150406-fb8b663191b0bd2a
        parent: jelmer at samba.org-20060613135748-c2a2cbc8444fc809
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: non-bzr-control-dirs
        timestamp: Tue 2006-06-13 17:04:06 +0200
        message:
          Change set of control dir formats to list.
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060613135748-c2a2cbc8444fc809
        parent: jelmer at samba.org-20060613132440-24e222a86f948f60
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: non-bzr-control-dirs
        timestamp: Tue 2006-06-13 15:57:48 +0200
        message:
          Fix a couple of minor issues after review by Martin. 
          Fix doctests.
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060613132440-24e222a86f948f60
        parent: robertc at robertcollins.net-20060601061200-d242f0a952014f17
        parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: non-bzr-control-dirs
        timestamp: Tue 2006-06-13 15:24:40 +0200
        message:
          [merge] bzr.dev
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060601061200-d242f0a952014f17
        parent: robertc at robertcollins.net-20060530130237-68b9ae68a12848ee
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hg-repo
        timestamp: Thu 2006-06-01 16:12:00 +1000
        message:
          Cosmetic niceties for debugging, extra comments etc.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060530130237-68b9ae68a12848ee
        parent: robertc at robertcollins.net-20060530124944-2448781ea0a5e892
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hg-repo
        timestamp: Tue 2006-05-30 23:02:37 +1000
        message:
          Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060530124944-2448781ea0a5e892
        parent: robertc at robertcollins.net-20060530124726-1452571a34787c78
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hg-repo
        timestamp: Tue 2006-05-30 22:49:44 +1000
        message:
          bugfix test for non .bzrdir support.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060530124726-1452571a34787c78
        parent: pqm at pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hg-repo
        timestamp: Tue 2006-05-30 22:47:26 +1000
        message:
          Support non '.bzr' control directories in bzrdir.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060613130303-e9de5dbda2e80da6
    parent: pqm at pqm.ubuntu.com-20060613121211-02c14916a5095573
    parent: robertc at robertcollins.net-20060613125545-cc77adde61a471bf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-13 14:03:03 +0100
    message:
      (robertc, abentley, jameinel, mpool)Various improvements to add performance.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060613125545-cc77adde61a471bf
        parent: robertc at robertcollins.net-20060613120453-ed340411e83c6760
        parent: robertc at robertcollins.net-20060613125439-5cbc77171d03a1a8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Tue 2006-06-13 22:55:45 +1000
        message:
          Merge add performance improvements.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060613125439-5cbc77171d03a1a8
        parent: robertc at robertcollins.net-20060611124643-d5e6433efe455058
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Tue 2006-06-13 22:54:39 +1000
        message:
          Review comments.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611124643-d5e6433efe455058
        parent: robertc at robertcollins.net-20060611114447-ba56b7e27a72c941
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 22:46:43 +1000
        message:
          Consolidate writes of adds to one write per file - drops encoding overhead by 1/3.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611114447-ba56b7e27a72c941
        parent: robertc at robertcollins.net-20060611112835-f589ab9ed2e52071
        parent: pqm at pqm.ubuntu.com-20060611100059-af22251835302b32
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 21:44:47 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611112835-f589ab9ed2e52071
        parent: robertc at robertcollins.net-20060611112719-a339cbad213519d2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 21:28:35 +1000
        message:
          Tweak InventoryEntry.sorted_children to be simpler.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611112719-a339cbad213519d2
        parent: robertc at robertcollins.net-20060611103038-3313df8fec2832d4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 21:27:19 +1000
        message:
          Add the inventory benchmark.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611103038-3313df8fec2832d4
        parent: robertc at robertcollins.net-20060611102826-e030e31831b14628
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 20:30:38 +1000
        message:
          Correct bzr diff | less= None clauses in inventory.py to be is not None.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611102826-e030e31831b14628
        parent: robertc at robertcollins.net-20060611091114-141ab4165857931e
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 20:28:26 +1000
        message:
          Give all inventory entries __slots__ that are useful with the current codebase.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611091114-141ab4165857931e
        parent: robertc at robertcollins.net-20060610193247-be43e4f7c71fb77f
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 19:11:14 +1000
        message:
          Remove spurious u cast from test_smart_add.py
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060610193247-be43e4f7c71fb77f
        parent: robertc at robertcollins.net-20060610185259-c8f971c890079308
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 05:32:47 +1000
        message:
          Teach walkdirs to walk a subdir of a tree.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060610185259-c8f971c890079308
        parent: robertc at robertcollins.net-20060610163640-6e698ef82c39d3cf
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 04:52:59 +1000
        message:
          Split out the recursive add and add of a single entry in add.py.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060610163640-6e698ef82c39d3cf
        parent: robertc at robertcollins.net-20060610114606-9a1d92b5e084da13
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sun 2006-06-11 02:36:40 +1000
        message:
          Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060610114606-9a1d92b5e084da13
        parent: robertc at robertcollins.net-20060609223504-c74f28b97738d122
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sat 2006-06-10 21:46:06 +1000
        message:
          De-dup the add list so we only walk subtrees once for add.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060609223504-c74f28b97738d122
        parent: robertc at robertcollins.net-20060609194516-78b45a1042ca3250
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sat 2006-06-10 08:35:04 +1000
        message:
          Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060609194516-78b45a1042ca3250
        parent: robertc at robertcollins.net-20060609194106-4423d88b66f47b87
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sat 2006-06-10 05:45:16 +1000
        message:
          Get add tests passing.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060609194106-4423d88b66f47b87
        parent: robertc at robertcollins.net-20060609192236-5db0810ce91a9a32
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sat 2006-06-10 05:41:06 +1000
        message:
          Merge basename call eliminate for smart_add.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060609192236-5db0810ce91a9a32
        parent: robertc at robertcollins.net-20060609120104-369c7d3266413526
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: add
        timestamp: Sat 2006-06-10 05:22:36 +1000
        message:
          Add an explicit test that adding a missing file barfs.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060613121211-02c14916a5095573
    parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
    parent: robertc at robertcollins.net-20060613120453-ed340411e83c6760
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-13 13:12:11 +0100
    message:
      (jrydberg, robertc, jameinel)Merge jrydbergs removal of weave_store from the Commit object.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060613120453-ed340411e83c6760
        parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
        parent: jrydberg at gnu.org-20060613114427-49c897150f86d0ae
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Tue 2006-06-13 22:04:53 +1000
        message:
          Merge jrydbergs removal of weave_store from the Commit object.
        ------------------------------------------------------------
        merged: jrydberg at gnu.org-20060613114427-49c897150f86d0ae
        parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
        committer: Johan Rydberg <jrydberg at gnu.org>
        branch nick: bzr.jrydberg.integration
        timestamp: Tue 2006-06-13 13:44:27 +0200
        message:
          Commit do not need a text store.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
    parent: pqm at pqm.ubuntu.com-20060612181635-930f7114f61dbfcb
    parent: aaron.bentley at utoronto.ca-20060612021145-0ced20f7791f3c66
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-06-13 03:04:41 +0100
    message:
      Fix some typos (found using aspell) (Jelmer Vernooij).
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060612021145-0ced20f7791f3c66
        parent: aaron.bentley at utoronto.ca-20060612020911-311adf39a0b59951
        parent: jelmer at samba.org-20060612015319-bed212cff7f6aaf9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: revert-missing
        timestamp: Sun 2006-06-11 22:11:45 -0400
        message:
          Fix some typos (found using aspell) (Jelmer Vernooij).
            ------------------------------------------------------------
            merged: jelmer at samba.org-20060612015319-bed212cff7f6aaf9
            parent: jelmer at samba.org-20060610002111-ff582d7ee2090037
            committer: Jelmer Vernooij <jelmer at samba.org>
            branch nick: integration
            timestamp: Mon 2006-06-12 02:53:19 +0100
            message:
              Revert some of my spelling fixes and fix some typos after review by Aaron.
            ------------------------------------------------------------
            merged: jelmer at samba.org-20060610002111-ff582d7ee2090037
            parent: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
            committer: Jelmer Vernooij <jelmer at samba.org>
            branch nick: integration
            timestamp: Sat 2006-06-10 01:21:11 +0100
            message:
              Fix some types (found using aspell).
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060612020911-311adf39a0b59951
        parent: aaron.bentley at utoronto.ca-20060416183509-1b9dd6ca753af367
        parent: pqm at pqm.ubuntu.com-20060611213609-113d9fc9c0f8edfc
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: revert-missing
        timestamp: Sun 2006-06-11 22:09:11 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060416183509-1b9dd6ca753af367
        parent: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
        parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: revert-missing
        timestamp: Sun 2006-04-16 14:35:09 -0400
        message:
          Merge from bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060612181635-930f7114f61dbfcb
    parent: pqm at pqm.ubuntu.com-20060612011214-3f50082086eb3ef6
    parent: abentley at panoramicfeedback.com-20060610221345-b540e12c9702ad8f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-12 19:16:35 +0100
    message:
      Hide diffs for old revisions in bundles
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060610221345-b540e12c9702ad8f
        parent: aaron.bentley at utoronto.ca-20060607164622-adee4e386f9aa1e1
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: bundles
        timestamp: Sat 2006-06-10 18:13:45 -0400
        message:
          Hide diffs for old revisions in bundles
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060612011214-3f50082086eb3ef6
    parent: pqm at pqm.ubuntu.com-20060611213609-113d9fc9c0f8edfc
    parent: aaron.bentley at utoronto.ca-20060612010502-c6b1884209866f3f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2006-06-12 02:12:14 +0100
    message:
      Stop using shlex in run_bzr_subprocess
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060612010502-c6b1884209866f3f
        parent: aaron.bentley at utoronto.ca-20060611212620-2517ff1406176fd9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: configobj
        timestamp: Sun 2006-06-11 21:05:02 -0400
        message:
          Stop using shlex in run_bzr_subprocess
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060611213609-113d9fc9c0f8edfc
    parent: pqm at pqm.ubuntu.com-20060611151400-2bf5c558ffe989f7
    parent: aaron.bentley at utoronto.ca-20060611212620-2517ff1406176fd9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-11 22:36:09 +0100
    message:
      Rename run_bzr_external -> run_bzr_subprocess, add docstring
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060611212620-2517ff1406176fd9
        parent: aaron.bentley at utoronto.ca-20060611042008-989b83f02e8505f5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: configobj
        timestamp: Sun 2006-06-11 17:26:20 -0400
        message:
          Rename run_bzr_external -> run_bzr_subprocess, add docstring
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20060611042008-989b83f02e8505f5
        parent: aaron.bentley at utoronto.ca-20060608232606-ae51cb0e2c685728
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: configobj
        timestamp: Sun 2006-06-11 00:20:08 -0400
        message:
          Fix benchmark to use run_bzr_external
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060611151400-2bf5c558ffe989f7
    parent: pqm at pqm.ubuntu.com-20060611100059-af22251835302b32
    parent: robertc at robertcollins.net-20060611150618-4521f34601795f32
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-11 16:14:00 +0100
    message:
      (robertc)Benchmarks for is_ignored.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611150618-4521f34601795f32
        parent: pqm at pqm.ubuntu.com-20060611100059-af22251835302b32
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2006-06-12 01:06:18 +1000
        message:
          (robertc)Benchmarks for is_ignored.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060611100059-af22251835302b32
    parent: pqm at pqm.ubuntu.com-20060611012603-c00c68cf5b2505d7
    parent: robertc at robertcollins.net-20060611095445-964d0edec80734f7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-11 11:00:59 +0100
    message:
      (robertc)Bugfix #49224 - treat xml as utf8 not ascii streams.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060611095445-964d0edec80734f7
        parent: pqm at pqm.ubuntu.com-20060611012603-c00c68cf5b2505d7
        parent: robertc at robertcollins.net-20060610081932-5ff9aad6ec2704a9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sun 2006-06-11 19:54:45 +1000
        message:
          Bugfix #49224 - treat xml as utf8 not ascii streams.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060610081932-5ff9aad6ec2704a9
        parent: robertc at robertcollins.net-20060609120104-369c7d3266413526
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree
        timestamp: Sat 2006-06-10 18:19:32 +1000
        message:
          Dont treat the basis inventory xml as ascii - its utf8 and should be preserved as such.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060611012603-c00c68cf5b2505d7
    parent: pqm at pqm.ubuntu.com-20060611012053-5eb565dce8194ae0
    parent: mbp at sourcefrog.net-20060610232941-42d6f8de5f279c14
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-11 02:26:03 +0100
    message:
      (mbp) split out check into repo & branch methods
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060610232941-42d6f8de5f279c14
        parent: mbp at sourcefrog.net-20060610232922-e8d8abcfb69dbb28
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.check
        timestamp: Sun 2006-06-11 09:29:41 +1000
        message:
          Update NEWS for check-related changes
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060610232922-e8d8abcfb69dbb28
        parent: mbp at sourcefrog.net-20060610231619-05b997deeb005d02
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.check
        timestamp: Sun 2006-06-11 09:29:22 +1000
        message:
          Restore removed fileid_involved* methods
          They're still used by some plugins
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060610231619-05b997deeb005d02
        parent: mbp at sourcefrog.net-20060526060847-20ed6bc6bf074b68
        parent: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.check
        timestamp: Sun 2006-06-11 09:16:19 +1000
        message:
          [merge] bzr.dev
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060526060847-20ed6bc6bf074b68
        parent: mbp at sourcefrog.net-20060526041158-921b3be3b2a5a00d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.worm
        timestamp: Fri 2006-05-26 16:08:47 +1000
        message:
          Split check into Branch.check and Repository.check
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060526041158-921b3be3b2a5a00d
        parent: mbp at sourcefrog.net-20060526035659-7c331b06a67c17a7
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.worm
        timestamp: Fri 2006-05-26 14:11:58 +1000
        message:
          sign-my-commits just signs revisions in the branch's ancestry.
          
          It no longer traverses the whole repository; and avoids calling
          repo.all_revision_ids.
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060526035659-7c331b06a67c17a7
        parent: mbp at sourcefrog.net-20060526031522-970db55990f75b16
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.worm
        timestamp: Fri 2006-05-26 13:56:59 +1000
        message:
          Add zero_nine deprecation
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060526031522-970db55990f75b16
        parent: pqm at pqm.ubuntu.com-20060525225841-625f0ece2f64af43
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.worm
        timestamp: Fri 2006-05-26 13:15:22 +1000
        message:
          Remove obsolete fileid_involved from KnitRepository, fix error message.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060611012053-5eb565dce8194ae0
    parent: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
    parent: john at arbash-meinel.com-20060610132724-01a44fdb1f0097b5
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2006-06-11 02:20:53 +0100
    message:
      (jam, alexander belchenko) Encoding fixes
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060610132724-01a44fdb1f0097b5
        parent: john at arbash-meinel.com-20060610125702-5eecc3274f00e576
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Sat 2006-06-10 08:27:24 -0500
        message:
          codecs.getwriter() doesn't set '.encoding' properly, so do the work for it.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060610125702-5eecc3274f00e576
        parent: john at arbash-meinel.com-20060609203014-7ecc6ec55ccc08c6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Sat 2006-06-10 07:57:02 -0500
        message:
          Fix bzrlib.urlutils.split() to work properly on win32 local paths.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060609203014-7ecc6ec55ccc08c6
        parent: john at arbash-meinel.com-20060609202938-4cea7bd2d59d83ff
        parent: bialix at ukr.net-20060609164624-a0b38bd6f9e433b3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-09 15:30:14 -0500
        message:
          [merge] Alexander Belchenko: check sys.stdin encoding in case sys.stdout is hidden.
            ------------------------------------------------------------
            merged: bialix at ukr.net-20060609164624-a0b38bd6f9e433b3
            parent: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: bzr.dev.bialix.using-stdin-encoding
            timestamp: Fri 2006-06-09 19:46:24 +0300
            message:
              When output of bzr piped then use sys.stdin.encoding to detect encoding of console
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060609202938-4cea7bd2d59d83ff
        parent: john at arbash-meinel.com-20060608144938-8b365524563666b4
        parent: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2006-06-09 15:29:38 -0500
        message:
          [merge] bzr.dev 1759
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
    parent: pqm at pqm.ubuntu.com-20060609114357-8314adbc35000d24
    parent: robertc at robertcollins.net-20060609120104-369c7d3266413526
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-09 13:07:03 +0100
    message:
      (robertc)Bugfix CommitBuilders recording of the inventory revision id.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060609114357-8314adbc35000d24
    parent: pqm at pqm.ubuntu.com-20060609100404-a45cd70353a09a67
    parent: robertc at robertcollins.net-20060609113327-f7cde64eb866d9bc
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2006-06-09 12:43:57 +0100
    message:
      (robertc)Trivial fix to check to not barf on a missing inventory sha1 value.



More information about the bazaar-commits mailing list