Rev 2435: Merge from bzr.dev. in http://bazaar.launchpad.net/~bzr

Andrew Bennetts andrew.bennetts at canonical.com
Tue Apr 24 09:07:45 BST 2007


At http://bazaar.launchpad.net/~bzr

------------------------------------------------------------
revno: 2435
revision-id: andrew.bennetts at canonical.com-20070424075513-ibtrd164miun08a8
parent: andrew.bennetts at canonical.com-20070424072048-tgbochqfr1n33bcy
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-protocol2
timestamp: Tue 2007-04-24 17:55:13 +1000
message:
  Merge from bzr.dev.
added:
  bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
  bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
  bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/smart/__init__.py       __init__.py-20061101100249-8jwwl0d3jr080zim-1
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
  bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
  bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
  bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
  bzrlib/tests/branch_implementations/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
  bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/readonly.py   readonly.py-20060120032407-66d3166c39ffdc79
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  doc/server.txt                 server.txt-20060913044801-h939fvbwzz39gf7g-1
  setup.py*                      setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
    ------------------------------------------------------------
    revno: 2432.1.15
    merged: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
    parent: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
    parent: andrew.bennetts at canonical.com-20070423083030-1mzq93srvd6b3abg
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 18:07:58 +0100
    message:
      (Andrew Bennetts) Make RemoteBzrDir.open_workingtree raise NoWorkingTree instead of NotLocalUrl when appropriate.
        ------------------------------------------------------------
        revno: 2432.1.13.1.1
        merged: andrew.bennetts at canonical.com-20070423083030-1mzq93srvd6b3abg
        parent: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: workingtree-msg
        timestamp: Mon 2007-04-23 18:30:30 +1000
        message:
          Make RemoteBzrDir.open_workingtree raise NoWorkingTree rather than NotLocalUrl
          when there is no remote working tree, avoiding spurious "This transport does not
          update the working tree" warnings from cmd_push.
    ------------------------------------------------------------
    revno: 2432.1.14
    merged: pqm at pqm.ubuntu.com-20070423075015-340ajk1vo3pzxheu
    parent: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
    parent: jml at canonical.com-20070423065558-wbkypy8qlhzrxugz
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 08:50:15 +0100
    message:
      (robertc) bzr --fixes support to allow recording of bugs that are fixed by commits. (Jonathan Lange, James Henstridge, Robert Collins)
        ------------------------------------------------------------
        revno: 2376.4.43
        merged: jml at canonical.com-20070423065558-wbkypy8qlhzrxugz
        parent: jml at canonical.com-20070423055929-chgdr92da63lhcri
        parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: bug-support
        timestamp: Mon 2007-04-23 16:55:58 +1000
        message:
          Merge from mainline, resolving conflict in help_topics
        ------------------------------------------------------------
        revno: 2376.4.42
        merged: jml at canonical.com-20070423055929-chgdr92da63lhcri
        parent: jml at canonical.com-20070423052447-q9qv5n7mhkdsqj46
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 15:59:29 +1000
        message:
          Parametrize URLParametrizedIntegerBugTracker even further so we don't need to
          subclass.
        ------------------------------------------------------------
        revno: 2376.4.41
        merged: jml at canonical.com-20070423052447-q9qv5n7mhkdsqj46
        parent: jml at canonical.com-20070423052217-nz0zuaesa0dcbvy2
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 15:24:47 +1000
        message:
          Update UniqueIntegerBugTracker docstring for new API
        ------------------------------------------------------------
        revno: 2376.4.40
        merged: jml at canonical.com-20070423052217-nz0zuaesa0dcbvy2
        parent: jml at canonical.com-20070423013035-zuqiamuro8h1hba9
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 15:22:17 +1000
        message:
          Redo the hierarchy of bug trackers to reduce duplication.
        ------------------------------------------------------------
        revno: 2376.4.39
        merged: jml at canonical.com-20070423013035-zuqiamuro8h1hba9
        parent: jml at canonical.com-20070422230056-mfu7bo3ydrbbag7p
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 11:30:35 +1000
        message:
          Can also set the bug config options in branch.conf
        ------------------------------------------------------------
        revno: 2376.4.38
        merged: jml at canonical.com-20070422230056-mfu7bo3ydrbbag7p
        parent: jml at canonical.com-20070422224848-cm8v6p5wmpx1psco
        parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 09:00:56 +1000
        message:
          Merge bzr.dev, resolving conflicts in error code.
        ------------------------------------------------------------
        revno: 2376.4.37
        merged: jml at canonical.com-20070422224848-cm8v6p5wmpx1psco
        parent: jml at canonical.com-20070422224519-wixpd8wnwxw70641
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:48:48 +1000
        message:
          Mention API additions in NEWS.
        ------------------------------------------------------------
        revno: 2376.4.36
        merged: jml at canonical.com-20070422224519-wixpd8wnwxw70641
        parent: jml at canonical.com-20070422222300-7xlpc7u275pvh2iw
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:45:19 +1000
        message:
          Provide really basic help topic for our bug tracker support.
        ------------------------------------------------------------
        revno: 2376.4.35
        merged: jml at canonical.com-20070422222300-7xlpc7u275pvh2iw
        parent: jml at canonical.com-20070422222226-pkjyasbt28k1aug7
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:23:00 +1000
        message:
          Include configuration documentation for tracker config options.
        ------------------------------------------------------------
        revno: 2376.4.34
        merged: jml at canonical.com-20070422222226-pkjyasbt28k1aug7
        parent: jml at canonical.com-20070420041308-93e07kmw1s9t1ceg
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Mon 2007-04-23 08:22:26 +1000
        message:
          Remove spurious quote mark in docstring.
        ------------------------------------------------------------
        revno: 2376.4.33
        merged: jml at canonical.com-20070420041308-93e07kmw1s9t1ceg
        parent: jml at canonical.com-20070420041143-td2407zcd2xygk70
        parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 14:13:08 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2376.4.32
        merged: jml at canonical.com-20070420041143-td2407zcd2xygk70
        parent: jml at canonical.com-20070420035328-i3hfywon1imyw0q7
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 14:11:43 +1000
        message:
          Basic documentation for --fixes option
        ------------------------------------------------------------
        revno: 2376.4.31
        merged: jml at canonical.com-20070420035328-i3hfywon1imyw0q7
        parent: jml at canonical.com-20070420034009-ii53ulxxwj1jnppt
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:53:28 +1000
        message:
          Whitespace normalization and use squid as an example rather than apache.
        ------------------------------------------------------------
        revno: 2376.4.30
        merged: jml at canonical.com-20070420034009-ii53ulxxwj1jnppt
        parent: jml at canonical.com-20070420031943-ufx3jtikoxp0mlpb
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:40:09 +1000
        message:
          Support for Bugzilla bug trackers.
        ------------------------------------------------------------
        revno: 2376.4.29
        merged: jml at canonical.com-20070420031943-ufx3jtikoxp0mlpb
        parent: jml at canonical.com-20070420031049-kwt6hkq8qdlgtm3z
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:19:43 +1000
        message:
          Tests for builtin trackers.
        ------------------------------------------------------------
        revno: 2376.4.28
        merged: jml at canonical.com-20070420031049-kwt6hkq8qdlgtm3z
        parent: jml at canonical.com-20070420022738-07tr3bqahw14ftdh
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 13:10:49 +1000
        message:
          Focus the tests better and clean up some dodgy bits in UnknownBugTrackerAbbreviation
        ------------------------------------------------------------
        revno: 2376.4.27
        merged: jml at canonical.com-20070420022738-07tr3bqahw14ftdh
        parent: jml at canonical.com-20070420022157-ampptjzryc2fju7t
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 12:27:38 +1000
        message:
          Include branch information in UnknownBugTrackerAbbreviation
        ------------------------------------------------------------
        revno: 2376.4.26
        merged: jml at canonical.com-20070420022157-ampptjzryc2fju7t
        parent: jml at canonical.com-20070420021008-eqpr2ta14upnb0ne
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 12:21:57 +1000
        message:
          Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
        ------------------------------------------------------------
        revno: 2376.4.25
        merged: jml at canonical.com-20070420021008-eqpr2ta14upnb0ne
        parent: jml at canonical.com-20070420015214-y9ufmdqpwd75zog8
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 12:10:08 +1000
        message:
          Make singleton bug tracker thing work via instances. 
        ------------------------------------------------------------
        revno: 2376.4.24
        merged: jml at canonical.com-20070420015214-y9ufmdqpwd75zog8
        parent: jml at canonical.com-20070420005627-p6rrsxowxkf7w5sy
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 11:52:14 +1000
        message:
          Make the Tracker class attribute 'abbrevation', not 'abbreviated_bugtracker_name'
        ------------------------------------------------------------
        revno: 2376.4.23
        merged: jml at canonical.com-20070420005627-p6rrsxowxkf7w5sy
        parent: jml at canonical.com-20070417075942-1vfzpwjf8rvbty1f
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-20 10:56:27 +1000
        message:
          Change 'tag' to 'abbreviated_tracker_name'
        ------------------------------------------------------------
        revno: 2376.4.22
        merged: jml at canonical.com-20070417075942-1vfzpwjf8rvbty1f
        parent: jml at canonical.com-20070417073819-m0r79gdukrq2j8kv
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Tue 2007-04-17 17:59:42 +1000
        message:
          Variety of whitespace cleanups, tightening of tests and docstring changes in
          response to review of bug support.
        ------------------------------------------------------------
        revno: 2376.4.21
        merged: jml at canonical.com-20070417073819-m0r79gdukrq2j8kv
        parent: jml at canonical.com-20070413072937-ndsxwg5svbk2542f
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Tue 2007-04-17 17:38:19 +1000
        message:
          Change the bugs separator to \n from ,
        ------------------------------------------------------------
        revno: 2376.4.20
        merged: jml at canonical.com-20070413072937-ndsxwg5svbk2542f
        parent: jml at canonical.com-20070413071912-vkcaqm87lduwlfs7
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 17:29:37 +1000
        message:
          Direct tests for UniqueBugTracker and UniqueIntegerBugTracker
        ------------------------------------------------------------
        revno: 2376.4.19
        merged: jml at canonical.com-20070413071912-vkcaqm87lduwlfs7
        parent: jml at canonical.com-20070413065621-hv9tv4ws25remckj
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 17:19:12 +1000
        message:
          Rename SimpleBugTracker to UniqueBugTracker
        ------------------------------------------------------------
        revno: 2376.4.18
        merged: jml at canonical.com-20070413065621-hv9tv4ws25remckj
        parent: jml at canonical.com-20070413064225-cmuz00itroirlro4
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:56:21 +1000
        message:
          Store all bug fix URLs in a single property.
        ------------------------------------------------------------
        revno: 2376.4.17
        merged: jml at canonical.com-20070413064225-cmuz00itroirlro4
        parent: jml at canonical.com-20070413062439-tn32nfugq13jg6kg
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:42:25 +1000
        message:
          Use urlutils.join instead of ugly, buggy, string mashing
        ------------------------------------------------------------
        revno: 2376.4.16
        merged: jml at canonical.com-20070413062439-tn32nfugq13jg6kg
        parent: jml at canonical.com-20070413061233-v14vlu2n6k1rxjgz
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:24:39 +1000
        message:
          "bug tracker" is two words, so use BugTracker in class names, not 'Bugtracker'
        ------------------------------------------------------------
        revno: 2376.4.15
        merged: jml at canonical.com-20070413061233-v14vlu2n6k1rxjgz
        parent: jml at canonical.com-20070413061123-r2vzcu0mpqcyaret
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:12:33 +1000
        message:
          Whitespace cleanup
        ------------------------------------------------------------
        revno: 2376.4.14
        merged: jml at canonical.com-20070413061123-r2vzcu0mpqcyaret
        parent: jml at canonical.com-20070413051007-cq318kt5uj59k1ty
        parent: jw+debian at jameswestby.net-20070412205830-77i29wqt0002bbxj
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 16:11:23 +1000
        message:
          Merge James Westby's refactoring
            ------------------------------------------------------------
            revno: 2376.4.8.1.1
            merged: jw+debian at jameswestby.net-20070412205830-77i29wqt0002bbxj
            parent: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev.bug
            timestamp: Thu 2007-04-12 21:58:30 +0100
            message:
              Add a superclass for easy bug trackers. Also add bugs.debian.org as deb:
        ------------------------------------------------------------
        revno: 2376.4.13
        merged: jml at canonical.com-20070413051007-cq318kt5uj59k1ty
        parent: jml at canonical.com-20070413045808-fx86n9ctjcbf4hvq
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 15:10:07 +1000
        message:
          Some stylistic cleanups
        ------------------------------------------------------------
        revno: 2376.4.12
        merged: jml at canonical.com-20070413045808-fx86n9ctjcbf4hvq
        parent: jml at canonical.com-20070413035248-l5lqpwr1t0yzp872
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 14:58:08 +1000
        message:
          Update NEWS file.
          Use non-lazy import
          Use run_bzr for running bzr in fixes tests.
        ------------------------------------------------------------
        revno: 2376.4.11
        merged: jml at canonical.com-20070413035248-l5lqpwr1t0yzp872
        parent: jml at canonical.com-20070413035020-z4gdg5sgmd5szc3o
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 13:52:48 +1000
        message:
          Provide a way of resetting list options (specifying '-' as the argument)
        ------------------------------------------------------------
        revno: 2376.4.10
        merged: jml at canonical.com-20070413035020-z4gdg5sgmd5szc3o
        parent: jml at canonical.com-20070413034711-pn129rtch4usvmdk
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 13:50:20 +1000
        message:
          Oops. Update tests to account for changed options to commit.
        ------------------------------------------------------------
        revno: 2376.4.9
        merged: jml at canonical.com-20070413034711-pn129rtch4usvmdk
        parent: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
        parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: lp-bugs
        timestamp: Fri 2007-04-13 13:47:11 +1000
        message:
          Merge from mainline.
        ------------------------------------------------------------
        revno: 2376.4.8
        merged: jml at canonical.com-20070411042318-y7tqzml42jkh1ux2
        parent: jml at canonical.com-20070411035653-himmtk357n8d3fbv
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 14:23:18 +1000
        message:
          Import sub-module, not member, following advice in HACKING
        ------------------------------------------------------------
        revno: 2376.4.7
        merged: jml at canonical.com-20070411035653-himmtk357n8d3fbv
        parent: jml at canonical.com-20070411002703-2jbq0152stafryqg
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 13:56:53 +1000
        message:
          - Add docstrings to tests.
          - Make the 'commit' command use the bugtracker infrastructure.
          - Update the blackbox tests
          - Move the 'is this a valid bug id' logic to the tracker
        ------------------------------------------------------------
        revno: 2376.4.6
        merged: jml at canonical.com-20070411002703-2jbq0152stafryqg
        parent: jml at canonical.com-20070410232958-2pl3j2qwujq5yjy9
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 10:27:03 +1000
        message:
          Basic docstrings for bugtracker.py
        ------------------------------------------------------------
        revno: 2376.4.5
        merged: jml at canonical.com-20070410232958-2pl3j2qwujq5yjy9
        parent: jml at canonical.com-20070410073307-3nrm81zu32wz9qbs
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-04-11 09:29:58 +1000
        message:
          Rename get_by_tag to get_tracker, to be more accurate.
        ------------------------------------------------------------
        revno: 2376.4.4
        merged: jml at canonical.com-20070410073307-3nrm81zu32wz9qbs
        parent: jml at canonical.com-20070410012227-k5ixuw4mik7z9kfh
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Tue 2007-04-10 17:33:07 +1000
        message:
          Beginnings of generic bug-tracker plugin system.
        ------------------------------------------------------------
        revno: 2376.4.3
        merged: jml at canonical.com-20070410012227-k5ixuw4mik7z9kfh
        parent: jml at canonical.com-20070402072630-0bjkptemr6wh50s3
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Tue 2007-04-10 11:22:27 +1000
        message:
          Merge RF
        ------------------------------------------------------------
        revno: 2376.4.2
        merged: jml at canonical.com-20070402072630-0bjkptemr6wh50s3
        parent: jml at canonical.com-20070328065202-1r825jxnabsy31ak
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Mon 2007-04-02 17:26:30 +1000
        message:
          More sophisticated error handling for --fixes option
        ------------------------------------------------------------
        revno: 2376.4.1
        merged: jml at canonical.com-20070328065202-1r825jxnabsy31ak
        parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
        committer: jml at canonical.com
        branch nick: lp-bugs
        timestamp: Wed 2007-03-28 16:52:02 +1000
        message:
          Blackbox-driven --fixes option to commit.
    ------------------------------------------------------------
    revno: 2432.1.13
    merged: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
    parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
    parent: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 08:08:09 +0100
    message:
      (robertc) Update doc/server.txt and the port the smart server listens on. (Robert Collins, #107125, #98918)
        ------------------------------------------------------------
        revno: 2432.1.11.1.3
        merged: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
        parent: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss-defaultport
        timestamp: Mon 2007-04-23 16:36:16 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 2432.1.11.1.2
        merged: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
        parent: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss-defaultport
        timestamp: Mon 2007-04-23 14:38:50 +1000
        message:
          ``bzr serve`` now listens on interface 0.0.0.0 by default, making it serve
          out to the local LAN and fixing bug 98918. (Robert Collins)
        ------------------------------------------------------------
        revno: 2432.1.11.1.1
        merged: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
        parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss-defaultport
        timestamp: Mon 2007-04-23 14:28:56 +1000
        message:
          Document the default bzr:// port (fixes #107125).
    ------------------------------------------------------------
    revno: 2432.1.12
    merged: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
    parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
    parent: robertc at robertcollins.net-20070423034148-b4m9c1iwl7528prf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 05:16:29 +0100
    message:
      (robertc) Mark bzrlib.tests and bzrlib.tests.TestUtil as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange)
        ------------------------------------------------------------
        revno: 1739.1.8
        merged: robertc at robertcollins.net-20070423034148-b4m9c1iwl7528prf
        parent: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
        parent: robertc at robertcollins.net-20070330063216-ug57fzsc4xzqi0hu
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-23 13:41:48 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 2387.2.1
        merged: robertc at robertcollins.net-20070330063216-ug57fzsc4xzqi0hu
        parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: cleanassertions
        timestamp: Fri 2007-03-30 16:32:16 +1000
        message:
          Mark bzrlib.tests as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange)
    ------------------------------------------------------------
    revno: 2432.1.11
    merged: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
    parent: pqm at pqm.ubuntu.com-20070423030158-cu7c1gqoom0rq2cd
    parent: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 04:32:45 +0100
    message:
      (robertc) 'bzr help urlspec' - new topic giving help on http://, sftp:// etc. (Goffredo Baroncelli)
        ------------------------------------------------------------
        revno: 1739.1.7
        merged: robertc at robertcollins.net-20070423025830-2t4rc0lgkysjmigd
        parent: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
        parent: ghigo at venice-20070421124308-icnfzoxvh2uar6ef
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-23 12:58:30 +1000
        message:
          Merge Goffredo's urlspec help patch and tweak the NEWS entries.
        ------------------------------------------------------------
        revno: 2241.2.13
        merged: ghigo at venice-20070421124308-icnfzoxvh2uar6ef
        parent: ghigo at venice-20070421122215-glii923x3cfwo02j
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-04-21 14:43:08 +0200
        message:
          NEWS file updated
        ------------------------------------------------------------
        revno: 2241.2.12
        merged: ghigo at venice-20070421122215-glii923x3cfwo02j
        parent: ghigo at venice-20070207210804-r551d0lozrp20uex
        parent: ghigo at venice-20070421110123-cc9axlewjexbmn63
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-04-21 14:22:15 +0200
        message:
          update to the latest bzr.dev
            ------------------------------------------------------------
            revno: 2241.2.4.1.6
            merged: ghigo at venice-20070421110123-cc9axlewjexbmn63
            parent: ghigo at venice-20070329204446-2j3uumjq9faxsigz
            parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Sat 2007-04-21 13:01:23 +0200
            message:
              Upgraded to the latest bzr.dev
            ------------------------------------------------------------
            revno: 2241.2.4.1.5
            merged: ghigo at venice-20070329204446-2j3uumjq9faxsigz
            parent: ghigo at venice-20070207205057-hveyr0yfn35dhhea
            parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Thu 2007-03-29 22:44:46 +0200
            message:
              update to the latest bzr.dev
        ------------------------------------------------------------
        revno: 2241.2.11
        merged: ghigo at venice-20070207210804-r551d0lozrp20uex
        parent: ghigo at venice-20070207205220-5tnjou7hz9722njy
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Wed 2007-02-07 22:08:04 +0100
        message:
          On the basis of Robert Collins and John Arbash Meinel
          - removed some protocol ( http[s]+pycurl:// and http[s]+urllib://, 
          bzr+http:// and readonly+ )
          - _help_on_trasport( ) now supports the missing of the modifiers
          - add a blackbox test case
          - little PEP8 cleanup
        ------------------------------------------------------------
        revno: 2241.2.10
        merged: ghigo at venice-20070207205220-5tnjou7hz9722njy
        parent: ghigo at venice-20070127175620-t4gyjzfy3hd2m59c
        parent: ghigo at venice-20070207205057-hveyr0yfn35dhhea
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Wed 2007-02-07 21:52:20 +0100
        message:
          Update to the latest bzr-transport-registry
            ------------------------------------------------------------
            revno: 2241.2.4.1.4
            merged: ghigo at venice-20070207205057-hveyr0yfn35dhhea
            parent: ghigo at venice-20070207203349-gc7actj3vso0haf2
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Wed 2007-02-07 21:50:57 +0100
            message:
              Updates on the basis of John Arbash Meinel comments
            ------------------------------------------------------------
            revno: 2241.2.4.1.3
            merged: ghigo at venice-20070207203349-gc7actj3vso0haf2
            parent: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
            parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Wed 2007-02-07 21:33:49 +0100
            message:
              update to the latest bzr.dev
        ------------------------------------------------------------
        revno: 2241.2.9
        merged: ghigo at venice-20070127175620-t4gyjzfy3hd2m59c
        parent: ghigo at venice-20070127175044-wpibgqm8wtpvmqe6
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-01-27 18:56:20 +0100
        message:
          add the 'file://' prefix to the urlspec topic
        ------------------------------------------------------------
        revno: 2241.2.8
        merged: ghigo at venice-20070127175044-wpibgqm8wtpvmqe6
        parent: ghigo at venice-20070127172631-etl6aa78zxak9t0e
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-01-27 18:50:44 +0100
        message:
          - rename transport urlspec
          - sort the transport without '://'
        ------------------------------------------------------------
        revno: 2241.2.7
        merged: ghigo at venice-20070127172631-etl6aa78zxak9t0e
        parent: ghigo at venice-20070126211058-rekclacctmf9tes8
        parent: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Sat 2007-01-27 18:26:31 +0100
        message:
          update to the latest bzr-transport-registry branch
            ------------------------------------------------------------
            revno: 2241.2.4.1.2
            merged: ghigo at venice-20070127172542-ejnyjb4mlxpgrhcd
            parent: ghigo at venice-20070127172441-cdb1cz664f9jqent
            parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Sat 2007-01-27 18:25:42 +0100
            message:
              update to the latest bzr.dev
            ------------------------------------------------------------
            revno: 2241.2.4.1.1
            merged: ghigo at venice-20070127172441-cdb1cz664f9jqent
            parent: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
            committer: ghigo <ghigo at venice>
            branch nick: bzr-transport-registry
            timestamp: Sat 2007-01-27 18:24:41 +0100
            message:
              uncomment test test__get_set_protocol_handlers
        ------------------------------------------------------------
        revno: 2241.2.6
        merged: ghigo at venice-20070126211058-rekclacctmf9tes8
        parent: ghigo at venice-20070126210953-2meopm4tu1x728wx
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Fri 2007-01-26 22:10:58 +0100
        message:
          removed unused code
        ------------------------------------------------------------
        revno: 2241.2.5
        merged: ghigo at venice-20070126210953-2meopm4tu1x728wx
        parent: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry-help-topics
        timestamp: Fri 2007-01-26 22:09:53 +0100
        message:
          add the topics transport
        ------------------------------------------------------------
        revno: 2241.2.4
        merged: ghigo at venice-20070126204417-p0o5hyx1d2s7qcmm
        parent: ghigo at venice-20070126204127-lnwfza86czjj5t9u
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Fri 2007-01-26 21:44:17 +0100
        message:
          removed commented line
        ------------------------------------------------------------
        revno: 2241.2.3
        merged: ghigo at venice-20070126204127-lnwfza86czjj5t9u
        parent: ghigo at venice-20070126203011-lhslhnwj1avh0jee
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Fri 2007-01-26 21:41:27 +0100
        message:
          removed the the registration of the 'None' transport, instead we use the set_default_transport function
          rename transport_registry in transport_list_registry
          remove unused function
        ------------------------------------------------------------
        revno: 2241.2.2
        merged: ghigo at venice-20070126203011-lhslhnwj1avh0jee
        parent: ghigo at venice-20070124203508-4tg2vz734s5j40y7
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Fri 2007-01-26 21:30:11 +0100
        message:
          Create the TransportList class
        ------------------------------------------------------------
        revno: 2241.2.1
        merged: ghigo at venice-20070124203508-4tg2vz734s5j40y7
        parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
        committer: ghigo <ghigo at venice>
        branch nick: bzr-transport-registry
        timestamp: Wed 2007-01-24 21:35:08 +0100
        message:
          Add the TransportRegistry class
    ------------------------------------------------------------
    revno: 2432.1.10
    merged: pqm at pqm.ubuntu.com-20070423030158-cu7c1gqoom0rq2cd
    parent: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
    parent: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 04:01:58 +0100
    message:
      (robertc) Add the infrastructure for having C extension modules based on pyrex in bzrlib. (Robert Collins).
        ------------------------------------------------------------
        revno: 1739.1.6
        merged: robertc at robertcollins.net-20070423022935-9hhongamvk6bfdso
        parent: robertc at robertcollins.net-20070423022112-7nnzyf20z3od273b
        parent: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2007-04-23 12:29:35 +1000
        message:
          Resolve conflicts with bzr.dev.
        ------------------------------------------------------------
        revno: 1739.1.5
        merged: robertc at robertcollins.net-20070423022112-7nnzyf20z3od273b
        parent: robertc at robertcollins.net-20070311233427-z8skxqrx8shqy1de
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2007-04-23 12:21:12 +1000
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 1739.1.4
        merged: robertc at robertcollins.net-20070311233427-z8skxqrx8shqy1de
        parent: robertc at robertcollins.net-20070308040606-84gsniv56huiyjt4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2007-03-12 10:34:27 +1100
        message:
          Fix building of C modules without pyrex installed.
        ------------------------------------------------------------
        revno: 1739.1.3
        merged: robertc at robertcollins.net-20070308040606-84gsniv56huiyjt4
        parent: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
        parent: robertc at robertcollins.net-20070307120012-cgx5yk2cob9v0i92
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Thu 2007-03-08 15:06:06 +1100
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1739.1.2
        merged: robertc at robertcollins.net-20060609141337-4ea84d88e8d4dc0f
        parent: robertc at robertcollins.net-20060604173418-51fbd7c12775039e
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Sat 2006-06-10 00:13:37 +1000
        message:
          More pyrex finesse, documentation.
        ------------------------------------------------------------
        revno: 1739.1.1
        merged: robertc at robertcollins.net-20060604173418-51fbd7c12775039e
        parent: pqm at pqm.ubuntu.com-20060603212040-9ec7af97aa11d4d7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pyrex
        timestamp: Mon 2006-06-05 03:34:18 +1000
        message:
          First cut at adding pyrex facilities.
    ------------------------------------------------------------
    revno: 2432.1.9
    merged: pqm at pqm.ubuntu.com-20070423020944-lcu3twk2zj27bw5a
    parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
    parent: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-04-23 03:09:44 +0100
    message:
      (robertc) Fix bugs 107656 and 50408 by creating multiple help indices and cross referencing between them when user help requests are ambiguous. (Robert Collins)
        ------------------------------------------------------------
        revno: 2432.2.33
        merged: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
        parent: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-23 11:41:05 +1000
        message:
          Fix tests broken by deprecation of help.command_usage.
        ------------------------------------------------------------
        revno: 2432.2.32
        merged: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
        parent: robertc at robertcollins.net-20070423002453-6mw8b5sexbmlqer9
        parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Mon 2007-04-23 10:28:58 +1000
        message:
          Merge up with bzr.dev.
        ------------------------------------------------------------
        revno: 2432.2.31
        merged: robertc at robertcollins.net-20070423002453-6mw8b5sexbmlqer9
        parent: robertc at robertcollins.net-20070420054437-5txpyqld8y7cl3k5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Mon 2007-04-23 10:24:53 +1000
        message:
          Review feedback and put help.command_usage back in as a deprecated function.
        ------------------------------------------------------------
        revno: 2432.2.30
        merged: robertc at robertcollins.net-20070420054437-5txpyqld8y7cl3k5
        parent: robertc at robertcollins.net-20070420054157-mq24v4iv28awko06
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 15:44:37 +1000
        message:
          Fix the ModuleHelpTopic get_help_topic to be tested with closer to real world data and strip the bzrlib.plugins. prefix from the name.
        ------------------------------------------------------------
        revno: 2432.2.29
        merged: robertc at robertcollins.net-20070420054157-mq24v4iv28awko06
        parent: robertc at robertcollins.net-20070420053919-edekarog2f6qvyzx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 15:41:57 +1000
        message:
          Add get_help_topic to ModuleHelpTopic.
        ------------------------------------------------------------
        revno: 2432.2.28
        merged: robertc at robertcollins.net-20070420053919-edekarog2f6qvyzx
        parent: robertc at robertcollins.net-20070420053658-gpwvs7wkmivmlzlx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 15:39:19 +1000
        message:
          Add a get_help_topic method to commands.Command.
        ------------------------------------------------------------
        revno: 2432.2.27
        merged: robertc at robertcollins.net-20070420053658-gpwvs7wkmivmlzlx
        parent: robertc at robertcollins.net-20070420053228-wp4tmjr15vxbis24
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 15:36:58 +1000
        message:
          Add a get_help_topic method to RegisteredTopic.
        ------------------------------------------------------------
        revno: 2432.2.26
        merged: robertc at robertcollins.net-20070420053228-wp4tmjr15vxbis24
        parent: robertc at robertcollins.net-20070420053047-j3je771lfsqwg4e9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 15:32:28 +1000
        message:
          NEWS entry for bzr help PLUGINNAME.
        ------------------------------------------------------------
        revno: 2432.2.25
        merged: robertc at robertcollins.net-20070420053047-j3je771lfsqwg4e9
        parent: robertc at robertcollins.net-20070420043609-tuwv7tm97mmhh82p
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 15:30:47 +1000
        message:
          Return plugin module docstrings for 'bzr help plugin'.
        ------------------------------------------------------------
        revno: 2432.2.24
        merged: robertc at robertcollins.net-20070420043609-tuwv7tm97mmhh82p
        parent: robertc at robertcollins.net-20070420043544-icairz7kovb2go8a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 14:36:09 +1000
        message:
          Add plugins as a help index.
        ------------------------------------------------------------
        revno: 2432.2.23
        merged: robertc at robertcollins.net-20070420043544-icairz7kovb2go8a
        parent: robertc at robertcollins.net-20070420040831-xff3b3kdjnei9rmg
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 14:35:44 +1000
        message:
          Add a list of shadowed terms to "bzr help term".
        ------------------------------------------------------------
        revno: 2432.2.22
        merged: robertc at robertcollins.net-20070420040831-xff3b3kdjnei9rmg
        parent: robertc at robertcollins.net-20070420035406-e68xf089otkpo7xx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 14:08:31 +1000
        message:
          Teach RegisteredTopic to support the additional_see_also list of related help terms.
        ------------------------------------------------------------
        revno: 2432.2.21
        merged: robertc at robertcollins.net-20070420035406-e68xf089otkpo7xx
        parent: robertc at robertcollins.net-20070420033954-afes0jishuy9cf6k
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 13:54:06 +1000
        message:
          Teach Command.get_help_text to show additional help cross references when supplied.
        ------------------------------------------------------------
        revno: 2432.2.20
        merged: robertc at robertcollins.net-20070420033954-afes0jishuy9cf6k
        parent: robertc at robertcollins.net-20070420033220-bwu4sb8t1a6vfamw
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 13:39:54 +1000
        message:
          Modify the result of HelpIndices.search to include the index each result was found in.
        ------------------------------------------------------------
        revno: 2432.2.19
        merged: robertc at robertcollins.net-20070420033220-bwu4sb8t1a6vfamw
        parent: robertc at robertcollins.net-20070420031949-sxckxqm8tjtk9tzn
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 13:32:20 +1000
        message:
          Ensure each HelpIndex has a unique prefix.
        ------------------------------------------------------------
        revno: 2432.2.18
        merged: robertc at robertcollins.net-20070420031949-sxckxqm8tjtk9tzn
        parent: robertc at robertcollins.net-20070420030701-2val6cjy3eocu77y
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 13:19:49 +1000
        message:
          Add support for doing bzr help commands/COMMANDNAME.
        ------------------------------------------------------------
        revno: 2432.2.17
        merged: robertc at robertcollins.net-20070420030701-2val6cjy3eocu77y
        parent: robertc at robertcollins.net-20070420025644-sxlhafhnmv46xgfs
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 13:07:01 +1000
        message:
          Add prefixes to HelpIndexes.
        ------------------------------------------------------------
        revno: 2432.2.16
        merged: robertc at robertcollins.net-20070420025644-sxlhafhnmv46xgfs
        parent: robertc at robertcollins.net-20070420024834-aqmgb1fu8qiw73p6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 12:56:44 +1000
        message:
          Correct spelling of Indexs to Indices.
        ------------------------------------------------------------
        revno: 2432.2.15
        merged: robertc at robertcollins.net-20070420024834-aqmgb1fu8qiw73p6
        parent: robertc at robertcollins.net-20070420023210-tqvs66j9cucmm7li
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 12:48:34 +1000
        message:
          Rename Context (in bzrlib.help) to Index, for a clearer name.
        ------------------------------------------------------------
        revno: 2432.2.14
        merged: robertc at robertcollins.net-20070420023210-tqvs66j9cucmm7li
        parent: robertc at robertcollins.net-20070420022005-a291lv2j0c18urai
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 12:32:10 +1000
        message:
          Switch help.help to using HelpContexts completely, fixing bug 107656.
        ------------------------------------------------------------
        revno: 2432.2.13
        merged: robertc at robertcollins.net-20070420022005-a291lv2j0c18urai
        parent: robertc at robertcollins.net-20070420015710-apsxzfznrnpg6x17
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 12:20:05 +1000
        message:
          HelpCommandContext now implementes get_topics.
        ------------------------------------------------------------
        revno: 2432.2.12
        merged: robertc at robertcollins.net-20070420015710-apsxzfznrnpg6x17
        parent: robertc at robertcollins.net-20070420011512-wralvwk6y8esm83c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 11:57:10 +1000
        message:
          Relocate command help onto Command.
        ------------------------------------------------------------
        revno: 2432.2.11
        merged: robertc at robertcollins.net-20070420011512-wralvwk6y8esm83c
        parent: robertc at robertcollins.net-20070420010751-mghuh1ac3ce1ovhl
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 11:15:12 +1000
        message:
          Remove duplication by using the new help infrastructure for topic output.
        ------------------------------------------------------------
        revno: 2432.2.10
        merged: robertc at robertcollins.net-20070420010751-mghuh1ac3ce1ovhl
        parent: robertc at robertcollins.net-20070420005034-4z8nhh9x6nml05j2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 11:07:51 +1000
        message:
          Add get_help_text() to RegisteredTopic to get the help as a string.
        ------------------------------------------------------------
        revno: 2432.2.9
        merged: robertc at robertcollins.net-20070420005034-4z8nhh9x6nml05j2
        parent: robertc at robertcollins.net-20070420004517-w6lqtu5vz2lli7av
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:50:34 +1000
        message:
          Expand HelpContexts documentation.
        ------------------------------------------------------------
        revno: 2432.2.8
        merged: robertc at robertcollins.net-20070420004517-w6lqtu5vz2lli7av
        parent: robertc at robertcollins.net-20070420003403-0055vwwp20sdtpti
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:45:17 +1000
        message:
          HelpTopicContext now returns RegisteredTopic objects for get_topics calls.
        ------------------------------------------------------------
        revno: 2432.2.7
        merged: robertc at robertcollins.net-20070420003403-0055vwwp20sdtpti
        parent: robertc at robertcollins.net-20070420003040-6410f4x7k68hsx87
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:34:03 +1000
        message:
          HelpContexts.search now returns the found topics.
        ------------------------------------------------------------
        revno: 2432.2.6
        merged: robertc at robertcollins.net-20070420003040-6410f4x7k68hsx87
        parent: robertc at robertcollins.net-20070420001830-lrxkvu3fkd1d7bnn
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:30:40 +1000
        message:
          HelpContexts.search now invokes get_topics on each context.
        ------------------------------------------------------------
        revno: 2432.2.5
        merged: robertc at robertcollins.net-20070420001830-lrxkvu3fkd1d7bnn
        parent: robertc at robertcollins.net-20070420001415-iequi10ao2s4jtu4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:18:30 +1000
        message:
          Initial stub for topic searching.
        ------------------------------------------------------------
        revno: 2432.2.4
        merged: robertc at robertcollins.net-20070420001415-iequi10ao2s4jtu4
        parent: robertc at robertcollins.net-20070420000646-nwrkgumqaykrg1lz
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:14:15 +1000
        message:
          Add an explicit error for missing help topics.
        ------------------------------------------------------------
        revno: 2432.2.3
        merged: robertc at robertcollins.net-20070420000646-nwrkgumqaykrg1lz
        parent: robertc at robertcollins.net-20070419235717-rdjuxno46v5ugs7y
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 10:06:46 +1000
        message:
          Create a HelpContexts object to do help lookups.
        ------------------------------------------------------------
        revno: 2432.2.2
        merged: robertc at robertcollins.net-20070419235717-rdjuxno46v5ugs7y
        parent: robertc at robertcollins.net-20070419235443-nu7zolsraales40g
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 09:57:17 +1000
        message:
          Add a HelpCommandContext class for help from commands.
        ------------------------------------------------------------
        revno: 2432.2.1
        merged: robertc at robertcollins.net-20070419235443-nu7zolsraales40g
        parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: help-contexts
        timestamp: Fri 2007-04-20 09:54:43 +1000
        message:
          Add a HelpTopicContext object.
    ------------------------------------------------------------
    revno: 2432.1.8
    merged: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
    parent: pqm at pqm.ubuntu.com-20070421144713-wrfv38pfywoeg408
    parent: john at arbash-meinel.com-20070421144319-c0lnova7qdlvvr70
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-04-21 16:11:39 +0100
    message:
      (John Arbash Meinel) Fix bug #105479: properly handle moving a directory with children that have been added, renamed, removed
        ------------------------------------------------------------
        revno: 2432.1.6.1.16
        merged: john at arbash-meinel.com-20070421144319-c0lnova7qdlvvr70
        parent: john at arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Sat 2007-04-21 09:43:19 -0500
        message:
          NEWS for fixing bug #105479
        ------------------------------------------------------------
        revno: 2432.1.6.1.15
        merged: john at arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
        parent: john at arbash-meinel.com-20070420203953-qljfem7wrpujktl9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Sat 2007-04-21 09:39:50 -0500
        message:
          Remove a superfluous 'else' (recommended by Martin)
        ------------------------------------------------------------
        revno: 2432.1.6.1.14
        merged: john at arbash-meinel.com-20070420203953-qljfem7wrpujktl9
        parent: john at arbash-meinel.com-20070420203630-tmc7pwdid0mhkg77
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 15:39:53 -0500
        message:
          Clean up assert helper for missing parent.
        ------------------------------------------------------------
        revno: 2432.1.6.1.13
        merged: john at arbash-meinel.com-20070420203630-tmc7pwdid0mhkg77
        parent: john at arbash-meinel.com-20070420202856-mnb25dnlfwgkkqmh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 15:36:30 -0500
        message:
          Add a test for moving a directory where a child has been moved into a subdir.
        ------------------------------------------------------------
        revno: 2432.1.6.1.12
        merged: john at arbash-meinel.com-20070420202856-mnb25dnlfwgkkqmh
        parent: john at arbash-meinel.com-20070420202552-mz87cu22t6kqnyg2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 15:28:56 -0500
        message:
          Add a test with children that have been swapped
        ------------------------------------------------------------
        revno: 2432.1.6.1.11
        merged: john at arbash-meinel.com-20070420202552-mz87cu22t6kqnyg2
        parent: john at arbash-meinel.com-20070420195824-ec0j48hfl8w5rii4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 15:25:52 -0500
        message:
          Add a test for moving a directory with a renamed child.
        ------------------------------------------------------------
        revno: 2432.1.6.1.10
        merged: john at arbash-meinel.com-20070420195824-ec0j48hfl8w5rii4
        parent: john at arbash-meinel.com-20070420195649-hx0feab8y15wdxdj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 14:58:24 -0500
        message:
          Make WT4.move() properly handle moving a directory with a renamed child.
        ------------------------------------------------------------
        revno: 2432.1.6.1.9
        merged: john at arbash-meinel.com-20070420195649-hx0feab8y15wdxdj
        parent: john at arbash-meinel.com-20070420194857-g37q43yd3rsqqk85
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 14:56:49 -0500
        message:
          Add another (failing) test when we move an entry which has a renamed child.
        ------------------------------------------------------------
        revno: 2432.1.6.1.8
        merged: john at arbash-meinel.com-20070420194857-g37q43yd3rsqqk85
        parent: john at arbash-meinel.com-20070420194239-ee3ze9cwyoealgl6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 14:48:57 -0500
        message:
          Fix the case when renaming a directory with deleted children.
        ------------------------------------------------------------
        revno: 2432.1.6.1.7
        merged: john at arbash-meinel.com-20070420194239-ee3ze9cwyoealgl6
        parent: john at arbash-meinel.com-20070420193709-m0f5ga3ixhlugbnn
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 14:42:39 -0500
        message:
          While in this area, add a test for renaming a directory with removed children.
          Which actually currently fails.
        ------------------------------------------------------------
        revno: 2432.1.6.1.6
        merged: john at arbash-meinel.com-20070420193709-m0f5ga3ixhlugbnn
        parent: john at arbash-meinel.com-20070420193042-d2v07ewsqzemihcp
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 14:37:09 -0500
        message:
          Simplify the test since all we require is renaming a newly added entry's parent dir.
        ------------------------------------------------------------
        revno: 2432.1.6.1.5
        merged: john at arbash-meinel.com-20070420193042-d2v07ewsqzemihcp
        parent: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 14:30:42 -0500
        message:
          Fix the bug by not iterating over the same list we are modifying.
          If a record only exists in one tree (current) move_one() will remove it from
          the current block. Which means that the block we are
          iterating over may change underneath us. So grab a copy before iterating.
          Do some other small doc updates.
        ------------------------------------------------------------
        revno: 2432.1.6.1.4
        merged: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
        parent: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 13:20:16 -0500
        message:
          Extend the test slightly.
          Oddly enough, both newly added records are moved correctly,
          but the existing directory 'c/b/d' is not moved.
        ------------------------------------------------------------
        revno: 2432.1.6.1.3
        merged: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
        parent: john at arbash-meinel.com-20070420175713-64x3r196vbqad3y2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 13:13:39 -0500
        message:
          Add 2 new WT.move() tests, one of which exposes bug #105479
        ------------------------------------------------------------
        revno: 2432.1.6.1.2
        merged: john at arbash-meinel.com-20070420175713-64x3r196vbqad3y2
        parent: john at arbash-meinel.com-20070420164821-ml7cw68e09gcr54d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 12:57:13 -0500
        message:
          Add a check that all entries have a valid parent entry.
          If we have a non-absent entry, it must have a valid directory entry as a parent.
          (You can't have a present entry in an absent directory, or in a missing dir)
        ------------------------------------------------------------
        revno: 2432.1.6.1.1
        merged: john at arbash-meinel.com-20070420164821-ml7cw68e09gcr54d
        parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: rename_directory_105479
        timestamp: Fri 2007-04-20 11:48:21 -0500
        message:
          Create an assertion to help track down what the bug is.
    ------------------------------------------------------------
    revno: 2432.1.7
    merged: pqm at pqm.ubuntu.com-20070421144713-wrfv38pfywoeg408
    parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
    parent: bialix at ukr.net-20070421141508-8b2nqv6i2a0feuex
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-04-21 15:47:13 +0100
    message:
      (erik, bialix, r=john) Tags in long log
        ------------------------------------------------------------
        revno: 2388.1.13
        merged: bialix at ukr.net-20070421141508-8b2nqv6i2a0feuex
        parent: bialix at ukr.net-20070419200150-yyltrlev3s65w9h9
        parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: erik.tags
        timestamp: Sat 2007-04-21 17:15:08 +0300
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2388.1.12
        merged: bialix at ukr.net-20070419200150-yyltrlev3s65w9h9
        parent: bialix at ukr.net-20070419192839-p964uu06n6vbjgrt
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: erik.tags
        timestamp: Thu 2007-04-19 23:01:50 +0300
        message:
          direct test for tags.get_reverse_tag_dict()
        ------------------------------------------------------------
        revno: 2388.1.11
        merged: bialix at ukr.net-20070419192839-p964uu06n6vbjgrt
        parent: bialix at ukr.net-20070412111226-acm9l3u82mxajriw
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: erik.tags
        timestamp: Thu 2007-04-19 22:28:39 +0300
        message:
          changes after John's review
        ------------------------------------------------------------
        revno: 2388.1.10
        merged: bialix at ukr.net-20070412111226-acm9l3u82mxajriw
        parent: erik at bagfors.nu-20070411011800-7gxbox8gbqrdp40i
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: erik.tags
        timestamp: Thu 2007-04-12 14:12:26 +0300
        message:
          Slightly reworked: use None instead of [] as default tags list; PEP-8
        ------------------------------------------------------------
        revno: 2388.1.9
        merged: erik at bagfors.nu-20070411011800-7gxbox8gbqrdp40i
        parent: erik at bagfors.nu-20070411010457-vgajajul01xb9hl6
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Wed 2007-04-11 03:18:00 +0200
        message:
          test for merges with tags in log
        ------------------------------------------------------------
        revno: 2388.1.8
        merged: erik at bagfors.nu-20070411010457-vgajajul01xb9hl6
        parent: erik at bagfors.nu-20070411001329-ngzhv000ur5tffmn
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Wed 2007-04-11 03:04:57 +0200
        message:
          Redo based on input from Alexander
        ------------------------------------------------------------
        revno: 2388.1.7
        merged: erik at bagfors.nu-20070411001329-ngzhv000ur5tffmn
        parent: erik at bagfors.nu-20070409231340-2pak5i4mxsby70ir
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Wed 2007-04-11 02:13:29 +0200
        message:
          use , to separate tags in log
        ------------------------------------------------------------
        revno: 2388.1.6
        merged: erik at bagfors.nu-20070409231340-2pak5i4mxsby70ir
        parent: erik at bagfors.nu-20070405095117-ndglm72iuaxpi6u8
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Tue 2007-04-10 01:13:40 +0200
        message:
          change order of log headers
        ------------------------------------------------------------
        revno: 2388.1.5
        merged: erik at bagfors.nu-20070405095117-ndglm72iuaxpi6u8
        parent: erik at bagfors.nu-20070404222123-8bg6539vy9suln32
        parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Thu 2007-04-05 11:51:17 +0200
        message:
          [merge] bzr.dev
        ------------------------------------------------------------
        revno: 2388.1.4
        merged: erik at bagfors.nu-20070404222123-8bg6539vy9suln32
        parent: erik at bagfors.nu-20070404222059-bo7nbo782gkvqfhb
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Thu 2007-04-05 00:21:23 +0200
        message:
          added NEWS entry
        ------------------------------------------------------------
        revno: 2388.1.3
        merged: erik at bagfors.nu-20070404222059-bo7nbo782gkvqfhb
        parent: erik at bagfors.nu-20070404192802-pmu7ppsj4v8idg2f
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Thu 2007-04-05 00:20:59 +0200
        message:
          tests for tags in log output
        ------------------------------------------------------------
        revno: 2388.1.2
        merged: erik at bagfors.nu-20070404192802-pmu7ppsj4v8idg2f
        parent: erik at bagfors.nu-20070404192718-iqk7l4s93rnqnfad
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Wed 2007-04-04 21:28:02 +0200
        message:
          Use the reverse tag dict to show tags in log output
        ------------------------------------------------------------
        revno: 2388.1.1
        merged: erik at bagfors.nu-20070404192718-iqk7l4s93rnqnfad
        parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
        committer: Erik Bagfors <erik at bagfors.nu>
        branch nick: bzr.taglogs
        timestamp: Wed 2007-04-04 21:27:18 +0200
        message:
          created reverse_tag_dict in tags.py
    ------------------------------------------------------------
    revno: 2432.1.6
    merged: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
    parent: pqm at pqm.ubuntu.com-20070420121956-hbxbonnuyt92yy4u
    parent: john at arbash-meinel.com-20070420150522-lpbhxv739kynwyep
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-20 16:40:33 +0100
    message:
      (John Arbash Meinel) Fix bug #104257 to handle unknown files in previously empty versioned directories
        ------------------------------------------------------------
        revno: 2402.2.5
        merged: john at arbash-meinel.com-20070420150522-lpbhxv739kynwyep
        parent: john at arbash-meinel.com-20070413144709-6f529ghpukn2fhlq
        parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: iter_changes_unknowns_104257
        timestamp: Fri 2007-04-20 10:05:22 -0500
        message:
          [merge] bzr.dev 2428
        ------------------------------------------------------------
        revno: 2402.2.4
        merged: john at arbash-meinel.com-20070413144709-6f529ghpukn2fhlq
        parent: john at arbash-meinel.com-20070411175522-5t9shbp3dbkjawsy
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: iter_changes_unknowns_104257
        timestamp: Fri 2007-04-13 09:47:09 -0500
        message:
          Clean up the setup for clarity (suggested by Robert)
        ------------------------------------------------------------
        revno: 2402.2.3
        merged: john at arbash-meinel.com-20070411175522-5t9shbp3dbkjawsy
        parent: john at arbash-meinel.com-20070411175022-gdznyinz160vx05e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: iter_changes_unknowns_104257
        timestamp: Wed 2007-04-11 12:55:22 -0500
        message:
          NEWS for fixing bug #104257
        ------------------------------------------------------------
        revno: 2402.2.2
        merged: john at arbash-meinel.com-20070411175022-gdznyinz160vx05e
        parent: john at arbash-meinel.com-20070411170244-qael9owa2l2rcneh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: iter_changes_unknowns_104257
        timestamp: Wed 2007-04-11 12:50:22 -0500
        message:
          Fix _iter_changes to properly handle versioned (but empty) directories
          so that it yields files from there as unknown.
          Also check to make sure we don't recurse into subdirectories of these dirs.
        ------------------------------------------------------------
        revno: 2402.2.1
        merged: john at arbash-meinel.com-20070411170244-qael9owa2l2rcneh
        parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: iter_changes_unknowns_104257
        timestamp: Wed 2007-04-11 12:02:44 -0500
        message:
          Add a test which exposes the bug in WT4._iter_changes()
    ------------------------------------------------------------
    revno: 2432.1.5
    merged: pqm at pqm.ubuntu.com-20070420121956-hbxbonnuyt92yy4u
    parent: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
    parent: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-20 13:19:56 +0100
    message:
      new formats are network-compatible with old clients (#107168)
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.7
        merged: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
        parent: aaron.bentley at utoronto.ca-20070420041955-2vybpetf1bv0vktb
        parent: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-04-20 07:48:24 -0400
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.6
        merged: aaron.bentley at utoronto.ca-20070420041955-2vybpetf1bv0vktb
        parent: aaron.bentley at utoronto.ca-20070420032116-e1uvjjr2thrvcm8i
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-04-20 00:19:55 -0400
        message:
          Use ROOT_ID when the repository supports old clients (Bug #107168)
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.5
        merged: aaron.bentley at utoronto.ca-20070420032116-e1uvjjr2thrvcm8i
        parent: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
        parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-04-19 23:21:16 -0400
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 2432.1.4
    merged: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
    parent: pqm at pqm.ubuntu.com-20070420083347-m00rr4y00xjnv7or
    parent: mbp at sourcefrog.net-20070420080524-uxzqo3tgbg9d0fvi
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-20 10:08:29 +0100
    message:
      doc Dirstate.initialize
        ------------------------------------------------------------
        revno: 2425.5.1
        merged: mbp at sourcefrog.net-20070420080524-uxzqo3tgbg9d0fvi
        parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2007-04-20 18:05:24 +1000
        message:
          doc Dirstate.initialize
    ------------------------------------------------------------
    revno: 2432.1.3
    merged: pqm at pqm.ubuntu.com-20070420083347-m00rr4y00xjnv7or
    parent: pqm at pqm.ubuntu.com-20070420080902-6kdj9s5jhwq4sm7v
    parent: andrew.bennetts at canonical.com-20070420051146-m7pn8rgwfh1c8umz
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-20 09:33:47 +0100
    message:
      (Andrew Bennetts, and many others) High performance smart server: add smart (non-vfs) commands to the client and server.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.174
        merged: andrew.bennetts at canonical.com-20070420051146-m7pn8rgwfh1c8umz
        parent: andrew.bennetts at canonical.com-20070420041837-txtmgcf5e26rlagl
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-20 15:11:46 +1000
        message:
          Various nits discovered by pyflakes.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.173
        merged: andrew.bennetts at canonical.com-20070420041837-txtmgcf5e26rlagl
        parent: andrew.bennetts at canonical.com-20070420030057-cg0z7spio1stbtpo
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-20 14:18:37 +1000
        message:
          Remove unused import.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.172
        merged: andrew.bennetts at canonical.com-20070420030057-cg0z7spio1stbtpo
        parent: andrew.bennetts at canonical.com-20070419145520-3j94u46y5zfh0ybq
        parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-20 13:00:57 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.171
        merged: andrew.bennetts at canonical.com-20070419145520-3j94u46y5zfh0ybq
        parent: andrew.bennetts at canonical.com-20070419042920-fwr334s98mbcxh5e
        parent: andrew.bennetts at canonical.com-20070411051706-i5k643i402dtvzu3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-20 00:55:20 +1000
        message:
          Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
            ------------------------------------------------------------
            revno: 2404.1.1
            merged: andrew.bennetts at canonical.com-20070411051706-i5k643i402dtvzu3
            parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: faster-tests
            timestamp: Wed 2007-04-11 15:17:06 +1000
            message:
              Remove temporary directories from successful tests as soon as possible, thus making the full test suite much much faster.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.170
        merged: andrew.bennetts at canonical.com-20070419042920-fwr334s98mbcxh5e
        parent: andrew.bennetts at canonical.com-20070418112756-0sqsp5yxemwt3mrg
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-04-19 14:29:20 +1000
        message:
          Use 'null:' instead of '' to mean NULL_REVISION on the wire.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.169
        merged: andrew.bennetts at canonical.com-20070418112756-0sqsp5yxemwt3mrg
        parent: andrew.bennetts at canonical.com-20070418112453-r2711iqib94kutx0
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-18 21:27:56 +1000
        message:
          Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.168
        merged: andrew.bennetts at canonical.com-20070418112453-r2711iqib94kutx0
        parent: andrew.bennetts at canonical.com-20070418053831-u9bbsbljuzymrz6z
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-18 21:24:53 +1000
        message:
          Add some comments to test_clone_bzrdir_repository_branch_both_under_shared.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.167
        merged: andrew.bennetts at canonical.com-20070418053831-u9bbsbljuzymrz6z
        parent: andrew.bennetts at canonical.com-20070418051019-tek0rr8alo1z2sop
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-18 15:38:31 +1000
        message:
          Various changes in response to John's review.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.166
        merged: andrew.bennetts at canonical.com-20070418051019-tek0rr8alo1z2sop
        parent: andrew.bennetts at canonical.com-20070417095011-my9qj2tvugvslhhg
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-18 15:10:19 +1000
        message:
          Small changes in response to Aaron's review.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.165
        merged: andrew.bennetts at canonical.com-20070417095011-my9qj2tvugvslhhg
        parent: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 19:50:11 +1000
        message:
          Remove XXX
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.164
        merged: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
        parent: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 19:16:29 +1000
        message:
          Deal with some more review comments.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.163
        merged: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
        parent: andrew.bennetts at canonical.com-20070417043051-yt3bxfhm85byfntc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 19:01:53 +1000
        message:
          Deal with various review comments from Robert.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.162
        merged: andrew.bennetts at canonical.com-20070417043051-yt3bxfhm85byfntc
        parent: andrew.bennetts at canonical.com-20070417040051-xviz3okw2ofzwwjv
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 14:30:51 +1000
        message:
          Add some missing _ensure_real calls, and a missing import.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.161
        merged: andrew.bennetts at canonical.com-20070417040051-xviz3okw2ofzwwjv
        parent: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 14:00:51 +1000
        message:
          Reinstate forcing binary mode on windows in SmartServerStreamMedium.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.160
        merged: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
        parent: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
        parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 03:59:48 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.159
        merged: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
        parent: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 03:49:35 +1000
        message:
          Rename SmartClient to _SmartClient.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.158
        merged: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
        parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-04-17 03:23:40 +1000
        message:
          Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.157
        merged: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
        parent: andrew.bennetts at canonical.com-20070416055251-imntu6k33rni8h4o
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-04-16 16:53:00 +1000
        message:
          Remove unnecessary trivial divergences from bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.156
        merged: andrew.bennetts at canonical.com-20070416055251-imntu6k33rni8h4o
        parent: andrew.bennetts at canonical.com-20070416042411-6itr5e3kuqwpm65y
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-04-16 15:52:51 +1000
        message:
          Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.155
        merged: andrew.bennetts at canonical.com-20070416042411-6itr5e3kuqwpm65y
        parent: andrew.bennetts at canonical.com-20070416041315-w95yo01oar5pwsht
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-04-16 14:24:11 +1000
        message:
          Remove unused import
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.154
        merged: andrew.bennetts at canonical.com-20070416041315-w95yo01oar5pwsht
        parent: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-04-16 14:13:15 +1000
        message:
          Clear out BRANCH.TODO; all these items have been dealt with one way or another.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.153
        merged: andrew.bennetts at canonical.com-20070416025619-v6rjozkjjnrg970w
        parent: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-04-16 12:56:19 +1000
        message:
          Rename call2 to call_expecting_body, and other small changes prompted by review.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.152
        merged: andrew.bennetts at canonical.com-20070414142229-633813p69cryl6gm
        parent: andrew.bennetts at canonical.com-20070413143008-gd15pnoln3mrmjd7
        parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Sun 2007-04-15 00:22:29 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.151
        merged: andrew.bennetts at canonical.com-20070413143008-gd15pnoln3mrmjd7
        parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
        parent: andrew.bennetts at canonical.com-20070413142326-5o7two9lqz5fqvl6
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Sat 2007-04-14 00:30:08 +1000
        message:
          Small cosmetic tweaks to ease merging.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.150.1.2
            merged: andrew.bennetts at canonical.com-20070413142326-5o7two9lqz5fqvl6
            parent: andrew.bennetts at canonical.com-20070413073917-ra47o66q0uwgvsm7
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Sat 2007-04-14 00:23:26 +1000
            message:
              Clean up some imports.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.150.1.1
            merged: andrew.bennetts at canonical.com-20070413073917-ra47o66q0uwgvsm7
            parent: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
            parent: andrew.bennetts at canonical.com-20070413071857-s1rpgdaqrrlvcdsw
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Fri 2007-04-13 17:39:17 +1000
            message:
              Merge hpss-miscellany.
            ------------------------------------------------------------
            revno: 2414.2.1
            merged: andrew.bennetts at canonical.com-20070413071857-s1rpgdaqrrlvcdsw
            parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss-miscellany
            timestamp: Fri 2007-04-13 17:18:57 +1000
            message:
              Some miscellaneous new APIs, tests and other changes from the hpss branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.150
        merged: andrew.bennetts at canonical.com-20070413065307-qg7gt1yx57cauni5
        parent: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 16:53:07 +1000
        message:
          Tidy imports in HTTPTestUtil.py
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.149
        merged: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
        parent: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
        parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 16:23:59 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.148
        merged: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
        parent: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 16:18:40 +1000
        message:
          Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.147
        merged: andrew.bennetts at canonical.com-20070413054830-3kb1ryz3yiwo7vpv
        parent: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
        parent: andrew.bennetts at canonical.com-20070413051536-omtgid0zygdfbvra
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 15:48:30 +1000
        message:
          Merge rename-SmartTransport branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.146
        merged: andrew.bennetts at canonical.com-20070413015712-lvj50btwcb4k6w3i
        parent: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
        parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 11:57:12 +1000
        message:
          Merge in the branch with the extracted lock_write token changes, resolving conflicts.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.145
        merged: andrew.bennetts at canonical.com-20070413005608-jkzcnpbnftissj97
        parent: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 10:56:08 +1000
        message:
          Add a brief explanation of what tokens are used for to lock_write docstrings.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.144
        merged: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
        parent: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-04-13 02:22:21 +1000
        message:
          Fix four tests I broke with the Branch.lock_write changes.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.143
        merged: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
        parent: andrew.bennetts at canonical.com-20070412070833-5fio6r0fkgnf10u1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-04-12 18:04:51 +1000
        message:
          Remove some XXXs
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.142
        merged: andrew.bennetts at canonical.com-20070412070833-5fio6r0fkgnf10u1
        parent: andrew.bennetts at canonical.com-20070411055816-oy64yjhzvtnrmfb9
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-04-12 17:08:33 +1000
        message:
          Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.141
        merged: andrew.bennetts at canonical.com-20070411055816-oy64yjhzvtnrmfb9
        parent: andrew.bennetts at canonical.com-20070411042623-4qav34z64fftnbyx
        parent: andrew.bennetts at canonical.com-20070411054339-b01z0zc1bj21x16o
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-11 15:58:16 +1000
        message:
          Merge supports-rich-root branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.140
        merged: andrew.bennetts at canonical.com-20070411042623-4qav34z64fftnbyx
        parent: andrew.bennetts at canonical.com-20070410155415-hyzlzwevu3ud0dny
        parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-11 14:26:23 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.139
        merged: andrew.bennetts at canonical.com-20070410155415-hyzlzwevu3ud0dny
        parent: robertc at robertcollins.net-20070405093526-bfbpg82tlc7kldni
        parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-04-11 01:54:15 +1000
        message:
          Merge from bzr.dev, resolving conflicts.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.138
        merged: robertc at robertcollins.net-20070405093526-bfbpg82tlc7kldni
        parent: andrew.bennetts at canonical.com-20070405054113-e41edg4i5mop40nd
        parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-04-05 19:35:26 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.137
        merged: andrew.bennetts at canonical.com-20070405054113-e41edg4i5mop40nd
        parent: andrew.bennetts at canonical.com-20070405044649-6w32o4u1im56i7kr
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-04-05 15:41:13 +1000
        message:
          Remove more duplicate code from bzrlib/transport/remote.py that has been moved elsewhere.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.136
        merged: andrew.bennetts at canonical.com-20070405044649-6w32o4u1im56i7kr
        parent: andrew.bennetts at canonical.com-20070330054348-h08inse3na9o7j8l
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-04-05 14:46:49 +1000
        message:
          Remote duplicated SmartServerRequestHandler from bzrlib/transport/remote.py; we use the one in bzrlib/smart/request.py now.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.135
        merged: andrew.bennetts at canonical.com-20070330054348-h08inse3na9o7j8l
        parent: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-30 15:43:48 +1000
        message:
          Prevent remote branch clients from determining the 'right' mode for control files, because we don't want clients setting the mode anyway.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.134
        merged: andrew.bennetts at canonical.com-20070330014631-a3xragco77jx67pv
        parent: andrew.bennetts at canonical.com-20070329090825-n2imszarc27gf6ls
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-30 11:46:31 +1000
        message:
          Fix the TooManyConcurrentRequests error message.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.133
        merged: andrew.bennetts at canonical.com-20070329090825-n2imszarc27gf6ls
        parent: robertc at robertcollins.net-20070329085846-0tmwanst070lb0e5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-03-29 19:08:25 +1000
        message:
          All TestLockableFiles_RemoteLockDir tests passing.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.132
        merged: robertc at robertcollins.net-20070329085846-0tmwanst070lb0e5
        parent: andrew.bennetts at canonical.com-20070329084623-ruqx0po8q3lxw0b7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 18:58:46 +1000
        message:
          Make all BzrDir implementation tests pass on RemoteBzrDir - fix some things, and remove the incomplete_with_basis tests as cruft.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.131
        merged: andrew.bennetts at canonical.com-20070329084623-ruqx0po8q3lxw0b7
        parent: robertc at robertcollins.net-20070329073949-t6qt1arpx375mjek
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-03-29 18:46:23 +1000
        message:
          Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.130
        merged: robertc at robertcollins.net-20070329073949-t6qt1arpx375mjek
        parent: robertc at robertcollins.net-20070329072414-7dh0io231c2tormb
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 17:39:49 +1000
        message:
          Make all branch_implementations tests pass.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.129
        merged: robertc at robertcollins.net-20070329072414-7dh0io231c2tormb
        parent: robertc at robertcollins.net-20070329065545-e4d0sbkszqbr5p84
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 17:24:14 +1000
        message:
          Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.128
        merged: robertc at robertcollins.net-20070329065545-e4d0sbkszqbr5p84
        parent: andrew.bennetts at canonical.com-20070329064628-gdonyjmcedx7q8vh
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 16:55:45 +1000
        message:
          Have RemoteBzrDirFormat create a local format object when it is asked to initialize something on a non-smart transport - allowing sprout to work cleanly.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.127
        merged: andrew.bennetts at canonical.com-20070329064628-gdonyjmcedx7q8vh
        parent: robertc at robertcollins.net-20070329060318-uqqabpbnzsnaldx7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-03-29 16:46:28 +1000
        message:
          Fix most of the lockable_files tests for RemoteBranchLockableFiles.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.126
        merged: robertc at robertcollins.net-20070329060318-uqqabpbnzsnaldx7
        parent: robertc at robertcollins.net-20070329050914-srdhcaubqro5awjs
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 16:03:18 +1000
        message:
          Make the InterRepository tests less abusive of the API for InterRepository. (Robert Collins, Andrew Bennetts)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.125
        merged: robertc at robertcollins.net-20070329050914-srdhcaubqro5awjs
        parent: robertc at robertcollins.net-20070329050040-mihvse1hk4mu7mxk
        parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 15:09:14 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.124
        merged: robertc at robertcollins.net-20070329050040-mihvse1hk4mu7mxk
        parent: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 15:00:40 +1000
        message:
          Fix test_format_initialize_find_open by delegating Branch formt lookup to the BzrDir, where it should have stayed from the start.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.123
        merged: robertc at robertcollins.net-20070329042156-28vdpsyvcbrw7wy9
        parent: robertc at robertcollins.net-20070329040816-w9220t3gkdb45n3i
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 14:21:56 +1000
        message:
          Translate ReadOnlyError in RemoteBranch._remote_lock_write.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.122
        merged: robertc at robertcollins.net-20070329040816-w9220t3gkdb45n3i
        parent: andrew.bennetts at canonical.com-20070329025245-8wdjghnbgjcp9mxy
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 14:08:16 +1000
        message:
          More Branch implementation test passing foo.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.121
        merged: andrew.bennetts at canonical.com-20070329025245-8wdjghnbgjcp9mxy
        parent: robertc at robertcollins.net-20070329023848-b6v5memfil1qq3uq
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-03-29 12:52:45 +1000
        message:
          Fix cmd_serve.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.120
        merged: robertc at robertcollins.net-20070329023848-b6v5memfil1qq3uq
        parent: robertc at robertcollins.net-20070329023227-1xss7o4d3bc56x8h
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 12:38:48 +1000
        message:
          The Repository API ``make_working_trees`` is now permitted to return
          False when ``set_make_working_trees`` is not implemented - previously
          an unimplemented ``set_make_working_trees`` implied the result True
          from ``make_working_trees``. This has been changed to accomodate the
          smart server, where it does not make sense (at this point) to ever
          make working trees by default. (Robert Collins)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.119
        merged: robertc at robertcollins.net-20070329023227-1xss7o4d3bc56x8h
        parent: robertc at robertcollins.net-20070329021404-5fcofqw7m3znip04
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 12:32:27 +1000
        message:
          Unbreak TestRepositoryMakeBranchAndTree.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.118
        merged: robertc at robertcollins.net-20070329021404-5fcofqw7m3znip04
        parent: robertc at robertcollins.net-20070329015852-akojjr51k9273rp7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 12:14:04 +1000
        message:
          Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.117
        merged: robertc at robertcollins.net-20070329015852-akojjr51k9273rp7
        parent: robertc at robertcollins.net-20070328225443-lqmj3q8wwkz5kztu
        parent: robertc at robertcollins.net-20070329013644-wajruf79j3we0iu8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 11:58:52 +1000
        message:
          Merge repository format attribute cleanup.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.116
        merged: robertc at robertcollins.net-20070328225443-lqmj3q8wwkz5kztu
        parent: robertc at robertcollins.net-20070328134526-y54ua41jbtoxbgcf
        parent: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Thu 2007-03-29 08:54:43 +1000
        message:
          Commit final test-case-cleanups branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.115
        merged: robertc at robertcollins.net-20070328134526-y54ua41jbtoxbgcf
        parent: robertc at robertcollins.net-20070328084906-3n8damdsktuvt5ob
        parent: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 23:45:26 +1000
        message:
          Merge incremental cleanups from hpss-test-correctness.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.114
        merged: robertc at robertcollins.net-20070328084906-3n8damdsktuvt5ob
        parent: robertc at robertcollins.net-20070328074837-v6jlmuzlbwcpfu7o
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 18:49:06 +1000
        message:
          Commit current test pass improvements.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.113
        merged: robertc at robertcollins.net-20070328074837-v6jlmuzlbwcpfu7o
        parent: robertc at robertcollins.net-20070328052828-mubnf4b0llxumi2b
        parent: robertc at robertcollins.net-20070328073307-ni7dcww9b1rf0udp
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 17:48:37 +1000
        message:
          Test only fixes from the ported-to-bzr.dev test-correctness branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.112
        merged: robertc at robertcollins.net-20070328052828-mubnf4b0llxumi2b
        parent: robertc at robertcollins.net-20070328033336-sql7uwiy63dgq70i
        parent: robertc at robertcollins.net-20070328051901-x5osh1c7fk75ira8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 15:28:28 +1000
        message:
          Updated chroot cleanups.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.111
        merged: robertc at robertcollins.net-20070328033336-sql7uwiy63dgq70i
        parent: robertc at robertcollins.net-20070328031239-tavfdk4e6yarr2na
        parent: robertc at robertcollins.net-20070328033235-sph663bdtwynteg9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 13:33:36 +1000
        message:
          Further test-usability for chroots.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.110
        merged: robertc at robertcollins.net-20070328031239-tavfdk4e6yarr2na
        parent: robertc at robertcollins.net-20070327222505-qtmqubr1zrnhjgnu
        parent: robertc at robertcollins.net-20070328030232-uunyt91y60b584j9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 13:12:39 +1000
        message:
          Merge up split out hpss-chroot branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.109
        merged: robertc at robertcollins.net-20070327222505-qtmqubr1zrnhjgnu
        parent: andrew.bennetts at canonical.com-20070327135702-vnyrun2ejnj5ji7j
        parent: robertc at robertcollins.net-20070327214650-v48kmnzoq865kbl6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2007-03-28 08:25:05 +1000
        message:
          Merge bzr.dev and record a merge against the split out urlutils work to prevent conflicts.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.104.1.2
            merged: robertc at robertcollins.net-20070327214650-v48kmnzoq865kbl6
            parent: robertc at robertcollins.net-20070327214559-3zto1rfp3g7dnzl9
            parent: robertc at robertcollins.net-20070327214317-2hqvbmbcztm9ycqb
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: hpss
            timestamp: Wed 2007-03-28 07:46:50 +1000
            message:
              Record merge against split out urlutils work.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.104.1.1
            merged: robertc at robertcollins.net-20070327214559-3zto1rfp3g7dnzl9
            parent: andrew.bennetts at canonical.com-20070327094624-jeh2g92906trijk3
            parent: pqm at pqm.ubuntu.com-20070327081802-271be0d343108f4f
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: hpss
            timestamp: Wed 2007-03-28 07:45:59 +1000
            message:
              Merge bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.108
        merged: andrew.bennetts at canonical.com-20070327135702-vnyrun2ejnj5ji7j
        parent: andrew.bennetts at canonical.com-20070327134409-img1fcrrh0dznei8
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-27 23:57:02 +1000
        message:
          Fix some tests in bzrdir_implementations that assumed make_branch_and_tree returns a tree with the same bzrdir as the branch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.107
        merged: andrew.bennetts at canonical.com-20070327134409-img1fcrrh0dznei8
        parent: andrew.bennetts at canonical.com-20070327130249-fweassil5stwtt1d
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-27 23:44:09 +1000
        message:
          Fix test_retire_bzrdir to cope with transports that aren't backed by disk.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.106
        merged: andrew.bennetts at canonical.com-20070327130249-fweassil5stwtt1d
        parent: andrew.bennetts at canonical.com-20070327113312-l712t10dawjvdujb
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-27 23:02:49 +1000
        message:
          Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.105
        merged: andrew.bennetts at canonical.com-20070327113312-l712t10dawjvdujb
        parent: andrew.bennetts at canonical.com-20070327094624-jeh2g92906trijk3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-27 21:33:12 +1000
        message:
          Implement revision_history caching for RemoteBranch.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.104
        merged: andrew.bennetts at canonical.com-20070327094624-jeh2g92906trijk3
        parent: andrew.bennetts at canonical.com-20070327064226-80ympk0j9aoc81oa
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-27 19:46:24 +1000
        message:
          Completely rework chrooted transports.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.103
        merged: andrew.bennetts at canonical.com-20070327064226-80ympk0j9aoc81oa
        parent: andrew.bennetts at canonical.com-20070321054214-zri3jrjvxiepvhl6
        parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-27 16:42:26 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.102
        merged: andrew.bennetts at canonical.com-20070321054214-zri3jrjvxiepvhl6
        parent: andrew.bennetts at canonical.com-20070316034056-2htzztjob2i4wsrt
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-03-21 16:42:14 +1100
        message:
          Make branch_implementations/test_http.py a little clearer.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.101
        merged: andrew.bennetts at canonical.com-20070316034056-2htzztjob2i4wsrt
        parent: andrew.bennetts at canonical.com-20070316033333-miblalavqdrr6zue
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-16 14:40:56 +1100
        message:
          Let make_branch_and_tree put checkouts in the current working directory.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.100
        merged: andrew.bennetts at canonical.com-20070316033333-miblalavqdrr6zue
        parent: andrew.bennetts at canonical.com-20070316032017-n43z217c0h6gkuns
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-16 14:33:33 +1100
        message:
          Fix IndexError in urlutils.join with 'http://host/a' and '../../b'.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.99
        merged: andrew.bennetts at canonical.com-20070316032017-n43z217c0h6gkuns
        parent: andrew.bennetts at canonical.com-20070316014406-clpywqu5jpdx1hjm
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-16 14:20:17 +1100
        message:
          Don't test mode setting for remote branches because they don't do mode setting.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.98
        merged: andrew.bennetts at canonical.com-20070316014406-clpywqu5jpdx1hjm
        parent: andrew.bennetts at canonical.com-20070316012733-chpwoqk66wa8oncf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-16 12:44:06 +1100
        message:
          Remove left over pdb.set_trace()
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.97
        merged: andrew.bennetts at canonical.com-20070316012733-chpwoqk66wa8oncf
        parent: andrew.bennetts at canonical.com-20070313065543-9ut4f0hw91ay6kdf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-03-16 12:27:33 +1100
        message:
          Fix more tests.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.96
        merged: andrew.bennetts at canonical.com-20070313065543-9ut4f0hw91ay6kdf
        parent: andrew.bennetts at canonical.com-20070313055201-ivxd3uhcvhqk995p
        parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-13 17:55:43 +1100
        message:
          Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
          still a little bit of breakage.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.95
        merged: andrew.bennetts at canonical.com-20070313055201-ivxd3uhcvhqk995p
        parent: andrew.bennetts at canonical.com-20070306133649-2371mkrfnrxcqjnn
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-13 16:52:01 +1100
        message:
          Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.94
        merged: andrew.bennetts at canonical.com-20070306133649-2371mkrfnrxcqjnn
        parent: andrew.bennetts at canonical.com-20070306112113-9pow71l4euaiftth
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-03-07 00:36:49 +1100
        message:
          Various small changes in aid of making tests pass (including deleting one invalid test).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.93
        merged: andrew.bennetts at canonical.com-20070306112113-9pow71l4euaiftth
        parent: andrew.bennetts at canonical.com-20070306080144-frjogke5hvc7a2t7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-06 22:21:13 +1100
        message:
          Fix another bug in urlutils.join.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.92
        merged: andrew.bennetts at canonical.com-20070306080144-frjogke5hvc7a2t7
        parent: andrew.bennetts at canonical.com-20070306071340-1nsftdleyx0ye73k
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-06 19:01:44 +1100
        message:
          Small bugfix to urlutils.join: join('anything', 'http://bar/a/') should not strip the trailing slash.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.91
        merged: andrew.bennetts at canonical.com-20070306071340-1nsftdleyx0ye73k
        parent: andrew.bennetts at canonical.com-20070306053139-9rntcbp5gi9008o9
        parent: andrew.bennetts at canonical.com-20070306071137-7aoryabu1ychy6ge
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-06 18:13:40 +1100
        message:
          Merge tidy-up to BzrDir.cloning_metadir.
            ------------------------------------------------------------
            revno: 2305.3.1
            merged: andrew.bennetts at canonical.com-20070306071137-7aoryabu1ychy6ge
            parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: trivial
            timestamp: Tue 2007-03-06 18:11:37 +1100
            message:
              Tidy up BzrDir.cloning_metadir: bogus try/except, and basis argument isn't actually used.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.90
        merged: andrew.bennetts at canonical.com-20070306053139-9rntcbp5gi9008o9
        parent: andrew.bennetts at canonical.com-20070305080113-hhmi12uzn1616n2u
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Tue 2007-03-06 16:31:39 +1100
        message:
          Fix test_upgrade_preserves_signatures; it incorrectly assumed that upgrade(wt, ...) would necessarily affect the repository.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.89
        merged: andrew.bennetts at canonical.com-20070305080113-hhmi12uzn1616n2u
        parent: andrew.bennetts at canonical.com-20070305074829-5jw2mszjxine5340
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 19:01:13 +1100
        message:
          Fix thinko in _get_checkout_format; checkouts for RemoteBranches should be in the default bzrdir/repo format, of course.  Thanks Robert.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.88
        merged: andrew.bennetts at canonical.com-20070305074829-5jw2mszjxine5340
        parent: andrew.bennetts at canonical.com-20070305073349-dr29xzo4jxj5niz5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 18:48:29 +1100
        message:
          Clarify make_branch_and_tree docstring a little.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.87
        merged: andrew.bennetts at canonical.com-20070305073349-dr29xzo4jxj5niz5
        parent: andrew.bennetts at canonical.com-20070305070421-y8wp2a7j7ymymyyk
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 18:33:49 +1100
        message:
          Make make_branch_and_tree fall back to creating a local checkout if the transport doesn't support working trees, allowing several more Remote tests to pass.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.86
        merged: andrew.bennetts at canonical.com-20070305070421-y8wp2a7j7ymymyyk
        parent: andrew.bennetts at canonical.com-20070305060419-g6jwzbokqechgsp1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 18:04:21 +1100
        message:
          Skip BoundSFTPTests when a workingtree can't be created at a non-local URL.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.85
        merged: andrew.bennetts at canonical.com-20070305060419-g6jwzbokqechgsp1
        parent: andrew.bennetts at canonical.com-20070305051557-1ky8luc1kt0c39x0
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 17:04:19 +1100
        message:
          Revert change to fetch.py that broke test_upgrade_preserves_signatures for non-Remote repositories.  Still hangs for Remote repos too :(
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.84
        merged: andrew.bennetts at canonical.com-20070305051557-1ky8luc1kt0c39x0
        parent: andrew.bennetts at canonical.com-20070305050314-tskdcd65ok6jyj9o
        parent: andrew.bennetts at canonical.com-20070301035839-mgsenxqgx4oveeob
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 16:15:57 +1100
        message:
          Merge in supports-rich-root, another test passing.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.83
        merged: andrew.bennetts at canonical.com-20070305050314-tskdcd65ok6jyj9o
        parent: andrew.bennetts at canonical.com-20070301050832-rf5egucjf7uypta5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-03-05 16:03:14 +1100
        message:
          Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.82
        merged: andrew.bennetts at canonical.com-20070301050832-rf5egucjf7uypta5
        parent: andrew.bennetts at canonical.com-20070301023318-yz01arzlhgmgnz7g
        parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-03-01 16:08:32 +1100
        message:
          Merge from bzr.dev.  Breaks a few tests because there are new methods not yet implemented.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.81
        merged: andrew.bennetts at canonical.com-20070301023318-yz01arzlhgmgnz7g
        parent: andrew.bennetts at canonical.com-20070228122704-4987oavyndsprxxw
        parent: andrew.bennetts at canonical.com-20070301012234-pl8k56r5ui0orfxg
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-03-01 13:33:18 +1100
        message:
          All branch_implementations/test_locking tests passing.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.80.1.1
            merged: andrew.bennetts at canonical.com-20070301012234-pl8k56r5ui0orfxg
            parent: andrew.bennetts at canonical.com-20070228122704-4987oavyndsprxxw
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Thu 2007-03-01 12:22:34 +1100
            message:
              All branch_implementations/test_locking tests passing.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.80
        merged: andrew.bennetts at canonical.com-20070228122704-4987oavyndsprxxw
        parent: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
        parent: andrew.bennetts at canonical.com-20070228122251-49u5cagwiyvxqqjc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-02-28 23:27:04 +1100
        message:
          Many fixes and stub methods.  Nearly all of repository_implementations passes now, and a fair bit of branch_implementations does too.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.79.1.3
            merged: andrew.bennetts at canonical.com-20070228122251-49u5cagwiyvxqqjc
            parent: andrew.bennetts at canonical.com-20070228095707-1v1wa3himjoa1p27
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Wed 2007-02-28 23:22:51 +1100
            message:
              Make a couple more branch_implementations tests pass.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.79.1.2
            merged: andrew.bennetts at canonical.com-20070228095707-1v1wa3himjoa1p27
            parent: andrew.bennetts at canonical.com-20070228070825-q2dvkjb0a11ouhtx
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Wed 2007-02-28 20:57:07 +1100
            message:
              All but one repository_implementation tests for RemoteRepository passing.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.79.1.1
            merged: andrew.bennetts at canonical.com-20070228070825-q2dvkjb0a11ouhtx
            parent: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
            parent: andrew.bennetts at canonical.com-20070221071326-atz27got2gd86mvw
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Wed 2007-02-28 18:08:25 +1100
            message:
              Update to current hpss branch?  Fix lots of test failures.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.79.2.1
            merged: andrew.bennetts at canonical.com-20070221071326-atz27got2gd86mvw
            parent: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Wed 2007-02-21 18:13:26 +1100
            message:
              Skip some branch_implementation tests that use branch.control_files if testing RemoteBranches.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.79
        merged: andrew.bennetts at canonical.com-20070221055524-33rvlqtlyyn6v3h7
        parent: andrew.bennetts at canonical.com-20070219023638-d3wepid4l65cbar8
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-02-21 16:55:24 +1100
        message:
          Implement RemoteBranch.lock_write/unlock as smart operations.
          
          Because Branch.lock_write/unlock actually also lock/unlock the repository, I've
          slightly changed lock_write's interface to accept and return 'tokens' rather
          than 'token'.  i.e. a 2-tuple of (branch token, repo token), or None.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.78
        merged: andrew.bennetts at canonical.com-20070219023638-d3wepid4l65cbar8
        parent: larstiq at larstiq.dyndns.org-20070215230302-j5pyq8flndti2490
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-02-19 13:36:38 +1100
        message:
          Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
          smart protocol as appropriate, so that locking operations on RemoteRepositories
          work correctly.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.77
        merged: larstiq at larstiq.dyndns.org-20070215230302-j5pyq8flndti2490
        parent: andrew.bennetts at canonical.com-20070215013211-uj9q2b1qtq3x1peu
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss.clean
        timestamp: Fri 2007-02-16 00:03:02 +0100
        message:
          Fix typo in request_handlers registration of Branch.set_last_revision, and test that registration
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.76
        merged: andrew.bennetts at canonical.com-20070215013211-uj9q2b1qtq3x1peu
        parent: andrew.bennetts at canonical.com-20070213135929-bmohxoh4kxp9bxwc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-02-15 12:32:11 +1100
        message:
          Testing that repository.{dont_,}leave_lock_in_place raises NotImplementedError if lock_write returns None.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.75
        merged: andrew.bennetts at canonical.com-20070213135929-bmohxoh4kxp9bxwc
        parent: andrew.bennetts at canonical.com-20070212050945-vbhooxmswr6r380d
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-02-14 00:59:29 +1100
        message:
          Add Repository.{dont_,}leave_lock_in_place.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.74
        merged: andrew.bennetts at canonical.com-20070212050945-vbhooxmswr6r380d
        parent: andrew.bennetts at canonical.com-20070208065511-ny1p067c3poqwesp
        parent: andrew.bennetts at canonical.com-20070212044932-k9keo85c0s9gg5wv
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-02-12 16:09:45 +1100
        message:
          Merge from bzr.dev.hpss.api.changes.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.73
        merged: andrew.bennetts at canonical.com-20070208065511-ny1p067c3poqwesp
        parent: andrew.bennetts at canonical.com-20070205063552-liyzhsdop16nddgx
        parent: andrew.bennetts at canonical.com-20070208065130-gpzocn512ppmcm72
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-02-08 17:55:11 +1100
        message:
          Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.  Also some test tweaks.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.72.1.3
            merged: andrew.bennetts at canonical.com-20070208065130-gpzocn512ppmcm72
            parent: andrew.bennetts at canonical.com-20070208030648-2xc34ee8vvoxt035
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Thu 2007-02-08 17:51:30 +1100
            message:
              Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.72.1.2
            merged: andrew.bennetts at canonical.com-20070208030648-2xc34ee8vvoxt035
            parent: andrew.bennetts at canonical.com-20070208030114-70sddbm02excfsve
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Thu 2007-02-08 14:06:48 +1100
            message:
              Remove some duplicate code in test_remote
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.72.1.1
            merged: andrew.bennetts at canonical.com-20070208030114-70sddbm02excfsve
            parent: andrew.bennetts at canonical.com-20070205063552-liyzhsdop16nddgx
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Thu 2007-02-08 14:01:14 +1100
            message:
              Add TestBranch.test_set_revision_history
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.72
        merged: andrew.bennetts at canonical.com-20070205063552-liyzhsdop16nddgx
        parent: larstiq at larstiq.dyndns.org-20070204113003-wy6oz07l77f0hpe7
        parent: andrew.bennetts at canonical.com-20070205063314-d4gs6djeweqowxn7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Mon 2007-02-05 17:35:52 +1100
        message:
          Merge some local commits: a WSGI+chroot test fix, and include RemoteBranch in the branch_implementations tests.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.71.1.2
            merged: andrew.bennetts at canonical.com-20070205063314-d4gs6djeweqowxn7
            parent: andrew.bennetts at canonical.com-20070205051609-1oxwbeg70yzruqjt
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Mon 2007-02-05 17:33:14 +1100
            message:
              Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.71.1.1
            merged: andrew.bennetts at canonical.com-20070205051609-1oxwbeg70yzruqjt
            parent: larstiq at larstiq.dyndns.org-20070204113003-wy6oz07l77f0hpe7
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: hpss
            timestamp: Mon 2007-02-05 16:16:09 +1100
            message:
              Fix test_wsgi.TestWSGI.test_chrooting to work with the new chroot semantics.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.71
        merged: larstiq at larstiq.dyndns.org-20070204113003-wy6oz07l77f0hpe7
        parent: robertc at robertcollins.net-20070203185724-i6gudgl39nbv1qa8
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Sun 2007-02-04 12:30:03 +0100
        message:
          Remove spurious TestRepositoryGetRevisionGraph class definition
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.70
        merged: robertc at robertcollins.net-20070203185724-i6gudgl39nbv1qa8
        parent: robertc at robertcollins.net-20070203173724-gswe95wx03oqkjum
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sun 2007-02-04 05:57:24 +1100
        message:
          Only try to get real repositories when an operation requires them.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.69
        merged: robertc at robertcollins.net-20070203173724-gswe95wx03oqkjum
        parent: larstiq at larstiq.dyndns.org-20070203160453-q5llrsq61v1edkld
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sun 2007-02-04 04:37:24 +1100
        message:
          Prevent the smart server sending cruft over stderr to the client.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.68
        merged: larstiq at larstiq.dyndns.org-20070203160453-q5llrsq61v1edkld
        parent: larstiq at larstiq.dyndns.org-20070203154834-ucle8brpytbfbgbi
        parent: v.ladeuil+lp at free.fr-20070203155209-1mrxlytgtcwovift
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Sat 2007-02-03 17:04:53 +0100
        message:
          Merge RemoteRepository.gather_stats.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.63.1.3
            merged: v.ladeuil+lp at free.fr-20070203155209-1mrxlytgtcwovift
            parent: v.ladeuil+lp at free.fr-20070203145734-vuxwtgmwrn13odze
            committer: v.ladeuil+lp at free.fr
            branch nick: hpss
            timestamp: Sat 2007-02-03 16:52:09 +0100
            message:
              more tests for gather_stats
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.63.1.2
            merged: v.ladeuil+lp at free.fr-20070203145734-vuxwtgmwrn13odze
            parent: v.ladeuil+lp at free.fr-20070203134321-s8tykvh00hl45j7r
            committer: v.ladeuil+lp at free.fr
            branch nick: hpss
            timestamp: Sat 2007-02-03 15:57:34 +0100
            message:
              gather_stats server side and request registration
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.63.1.1
            merged: v.ladeuil+lp at free.fr-20070203134321-s8tykvh00hl45j7r
            parent: robertc at robertcollins.net-20070203105906-x45jgz536cvunbbx
            committer: v.ladeuil+lp at free.fr
            branch nick: hpss
            timestamp: Sat 2007-02-03 14:43:21 +0100
            message:
              Line too long
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.67
        merged: larstiq at larstiq.dyndns.org-20070203154834-ucle8brpytbfbgbi
        parent: larstiq at larstiq.dyndns.org-20070203153621-1d9kmc03i04mfksq
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Sat 2007-02-03 16:48:34 +0100
        message:
          Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.66
        merged: larstiq at larstiq.dyndns.org-20070203153621-1d9kmc03i04mfksq
        parent: robertc at robertcollins.net-20070203133806-23k6ycwczhna1j3f
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Sat 2007-02-03 16:36:21 +0100
        message:
          Fix repository test parameterization for RemoteRepository.
          (Wouter van Heyst, Robert Collins)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.65
        merged: robertc at robertcollins.net-20070203133806-23k6ycwczhna1j3f
        parent: robertc at robertcollins.net-20070203120738-vyfg1kkskz2l4kiv
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sun 2007-02-04 00:38:06 +1100
        message:
          Really fix the opening of RemoteBranches for both shared and nonshared repositories.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.64
        merged: robertc at robertcollins.net-20070203120738-vyfg1kkskz2l4kiv
        parent: robertc at robertcollins.net-20070203105906-x45jgz536cvunbbx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 23:07:38 +1100
        message:
          Allow Repository tests to be backed onto a specific VFS as needed.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.63
        merged: robertc at robertcollins.net-20070203105906-x45jgz536cvunbbx
        parent: robertc at robertcollins.net-20070203105720-wbxy8pkap13sdgq7
        parent: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 21:59:06 +1100
        message:
          Merge updated gather_stats to get repository wide info working.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.62
        merged: robertc at robertcollins.net-20070203105720-wbxy8pkap13sdgq7
        parent: robertc at robertcollins.net-20070203101104-obpia4s4zfq313nj
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 21:57:20 +1100
        message:
          Stub out RemoteRepository.gather_stats while its implemented in parallel.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.61
        merged: robertc at robertcollins.net-20070203101104-obpia4s4zfq313nj
        parent: robertc at robertcollins.net-20070203100954-vucxltziwzgkkyw0
        parent: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 21:11:04 +1100
        message:
          Merge Repository.gather_stats api for hpss.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.60
        merged: robertc at robertcollins.net-20070203100954-vucxltziwzgkkyw0
        parent: robertc at robertcollins.net-20070202192520-3fecwesz5o3hb0fo
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 21:09:54 +1100
        message:
          More missing methods from RemoteBranch and RemoteRepository to let 'info' get further.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.59
        merged: robertc at robertcollins.net-20070202192520-3fecwesz5o3hb0fo
        parent: larstiq at larstiq.dyndns.org-20070202180451-ug4361fboqj0qfcc
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 06:25:20 +1100
        message:
          Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.58
        merged: larstiq at larstiq.dyndns.org-20070202180451-ug4361fboqj0qfcc
        parent: robertc at robertcollins.net-20070202173408-pt1fl00icfekufxi
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Fri 2007-02-02 19:04:51 +0100
        message:
          Small test fixes to reflect naming and documentation
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.57
        merged: robertc at robertcollins.net-20070202173408-pt1fl00icfekufxi
        parent: robertc at robertcollins.net-20070202170549-ykriy5021olx98eu
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 04:34:08 +1100
        message:
          Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.56
        merged: robertc at robertcollins.net-20070202170549-ykriy5021olx98eu
        parent: robertc at robertcollins.net-20070202061527-ep28ktwh0th06gbo
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Sat 2007-02-03 04:05:49 +1100
        message:
          Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.55
        merged: robertc at robertcollins.net-20070202061527-ep28ktwh0th06gbo
        parent: andrew.bennetts at canonical.com-20070202053106-j1n21t61x5wdxu64
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2007-02-02 17:15:27 +1100
        message:
          Give RemoteBranch a base url in line with the Branch protocol.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.54
        merged: andrew.bennetts at canonical.com-20070202053106-j1n21t61x5wdxu64
        parent: andrew.bennetts at canonical.com-20070202013427-s8eiu8d3g78c8prs
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-02-02 16:31:06 +1100
        message:
          Fix ChrootTransportDecorator's abspath method to be consistent with its clone
          method when dealing with relpaths that start with "/".
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.53
        merged: andrew.bennetts at canonical.com-20070202013427-s8eiu8d3g78c8prs
        parent: larstiq at larstiq.dyndns.org-20070201180900-4iusc3mjwwq5lt1j
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2007-02-02 12:34:27 +1100
        message:
          Small fix to urlutils.joinpath that was causing a misbehaviour in 
          ChrootedTransportDecorator.clone.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.52
        merged: larstiq at larstiq.dyndns.org-20070201180900-4iusc3mjwwq5lt1j
        parent: larstiq at larstiq.dyndns.org-20070201174038-9cp5yxon7a5igkqk
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Thu 2007-02-01 19:09:00 +0100
        message:
          Provide more information when encountering unexpected responses from a smart
          server.  (Wouter van Heyst, Vincent Ladeuil, Robert Collins)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.51
        merged: larstiq at larstiq.dyndns.org-20070201174038-9cp5yxon7a5igkqk
        parent: larstiq at larstiq.dyndns.org-20070201160944-od4tx1f4a6ens2n0
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Thu 2007-02-01 18:40:38 +0100
        message:
          Test and implement RemoteBranch.last_revision_info()
          (Wouter van Heyst, Robert Collins, Vincent Ladeuil)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.50
        merged: larstiq at larstiq.dyndns.org-20070201160944-od4tx1f4a6ens2n0
        parent: larstiq at larstiq.dyndns.org-20070201154238-uu3l7iizk31d45as
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Thu 2007-02-01 17:09:44 +0100
        message:
          Add SmartServerBranchRequestLastRevisionInfo method.
          (Wouter van Heyst, Robert Collins, Vincent Ladeuil)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.49
        merged: larstiq at larstiq.dyndns.org-20070201154238-uu3l7iizk31d45as
        parent: larstiq at larstiq.dyndns.org-20070201152242-rwgu7dtaz2l2v4gp
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Thu 2007-02-01 16:42:38 +0100
        message:
          Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
          allow easier writing of smartserver Branch methods.
          (Wouter van Heyst, Robert Collins)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.48
        merged: larstiq at larstiq.dyndns.org-20070201152242-rwgu7dtaz2l2v4gp
        parent: andrew.bennetts at canonical.com-20070201065505-om3g02ffix0vl3k8
        parent: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: hpss
        timestamp: Thu 2007-02-01 16:22:42 +0100
        message:
          Merge the Branch.last_revision_info api change.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.47
        merged: andrew.bennetts at canonical.com-20070201065505-om3g02ffix0vl3k8
        parent: andrew.bennetts at canonical.com-20070201050316-tja93nv3i3d6ucku
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-02-01 17:55:05 +1100
        message:
          Make SmartTCPServer_for_Testing.setUp's backing_transport_server argument optional.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.46
        merged: andrew.bennetts at canonical.com-20070201050316-tja93nv3i3d6ucku
        parent: andrew.bennetts at canonical.com-20070201014908-xmhw8eg0a7t0f758
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-02-01 16:03:16 +1100
        message:
          Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.45
        merged: andrew.bennetts at canonical.com-20070201014908-xmhw8eg0a7t0f758
        parent: andrew.bennetts at canonical.com-20070131122335-v79cgeavk4dqp73c
        parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2007-02-01 12:49:08 +1100
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.44
        merged: andrew.bennetts at canonical.com-20070131122335-v79cgeavk4dqp73c
        parent: andrew.bennetts at canonical.com-20061221155042-m63gy5z4vztk8ngj
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Wed 2007-01-31 23:23:35 +1100
        message:
          Small changes to help a couple more tests pass.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.43
        merged: andrew.bennetts at canonical.com-20061221155042-m63gy5z4vztk8ngj
        parent: robertc at robertcollins.net-20061129034335-692a00550b9109a8
        parent: pqm at pqm.ubuntu.com-20061221043820-0b56b176269f173a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Fri 2006-12-22 02:50:42 +1100
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.42
        merged: robertc at robertcollins.net-20061129034335-692a00550b9109a8
        parent: robertc at robertcollins.net-20061128025534-1c132391351b65e9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2006-11-29 14:43:35 +1100
        message:
          Various hopefully improvements, but wsgi is broken, handing over to spiv :).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.41
        merged: robertc at robertcollins.net-20061128025534-1c132391351b65e9
        parent: robertc at robertcollins.net-20061128022124-9359f58013ff94d8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Tue 2006-11-28 13:55:34 +1100
        message:
          Fix SmartServerResponse.__eq__ to handle None.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.40
        merged: robertc at robertcollins.net-20061128022124-9359f58013ff94d8
        parent: robertc at robertcollins.net-20061128013723-cd07a2ccb796b80a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Tue 2006-11-28 13:21:24 +1100
        message:
          Implement a remote Repository.has_revision method.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.39
        merged: robertc at robertcollins.net-20061128013723-cd07a2ccb796b80a
        parent: robertc at robertcollins.net-20061124034136-54af820c9797fe30
        parent: robertc at robertcollins.net-20061128010415-b004ee4bfebfad9c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Tue 2006-11-28 12:37:23 +1100
        message:
          Merge integration and knit-index utf8 decoding fixes.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.38
        merged: robertc at robertcollins.net-20061124034136-54af820c9797fe30
        parent: andrew.bennetts at canonical.com-20061123061615-4b2a1fb77e6e4dc4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-24 14:41:36 +1100
        message:
          Implement RemoteBranch.revision_history().
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.37
        merged: andrew.bennetts at canonical.com-20061123061615-4b2a1fb77e6e4dc4
        parent: andrew.bennetts at canonical.com-20061123053021-8549e8989eda8ee9
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2006-11-23 17:16:15 +1100
        message:
          Make sure all the request handlers in bzrlib/smart/vfs.py have consistent names.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.36
        merged: andrew.bennetts at canonical.com-20061123053021-8549e8989eda8ee9
        parent: andrew.bennetts at canonical.com-20061123012847-15406b2537c5dcda
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2006-11-23 16:30:21 +1100
        message:
          Fix typo, and clean up some ununsed import warnings from pyflakes at the same time.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.35
        merged: andrew.bennetts at canonical.com-20061123012847-15406b2537c5dcda
        parent: robertc at robertcollins.net-20061122034604-349a69c544a1706a
        parent: andrew.bennetts at canonical.com-20061121081935-6440ef860ef00262
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss
        timestamp: Thu 2006-11-23 12:28:47 +1100
        message:
          Merge bzr.dev (via NO_SMART_VFS branch).
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.24.1.1
            merged: andrew.bennetts at canonical.com-20061121081935-6440ef860ef00262
            parent: andrew.bennetts at canonical.com-20061115012708-2a2234d64afbfd42
            parent: andrew.bennetts at canonical.com-20061121081704-1899cc83e9d4b59e
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: NO_SMART_VFS environment variable
            timestamp: Tue 2006-11-21 19:19:35 +1100
            message:
              Merge from bzr.dev.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.23.1.1
            merged: andrew.bennetts at canonical.com-20061121081704-1899cc83e9d4b59e
            parent: andrew.bennetts at canonical.com-20061114225707-35c7cfee464abb37
            parent: andrew.bennetts at canonical.com-20061121081646-ef6a49ad44bf2f9b
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: split smart
            timestamp: Tue 2006-11-21 19:17:04 +1100
            message:
              Merge from bzr.dev.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.1.1.1
            merged: andrew.bennetts at canonical.com-20061121081646-ef6a49ad44bf2f9b
            parent: andrew.bennetts at canonical.com-20061101095656-88d3e7014bb0ce63
            parent: pqm at pqm.ubuntu.com-20061120225523-9a6692bea52007b0
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: remote + wsgi integration
            timestamp: Tue 2006-11-21 19:16:46 +1100
            message:
              Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.34
        merged: robertc at robertcollins.net-20061122034604-349a69c544a1706a
        parent: andrew.bennetts at canonical.com-20061121072903-82e6c6cc18eb232e
        parent: robertc at robertcollins.net-20061122024926-41ba3a48a35200ee
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Wed 2006-11-22 14:46:04 +1100
        message:
          Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
            ------------------------------------------------------------
            revno: 2018.1.11.1.25.1.13.1.32.1.1
            merged: robertc at robertcollins.net-20061122024926-41ba3a48a35200ee
            parent: robertc at robertcollins.net-20061117001900-6c2be7c7934f74d8
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: hpss
            timestamp: Wed 2006-11-22 13:49:26 +1100
            message:
              Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.33
        merged: andrew.bennetts at canonical.com-20061121072903-82e6c6cc18eb232e
        parent: robertc at robertcollins.net-20061117001900-6c2be7c7934f74d8
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: Register RemoteBzrDirFormat always.
        timestamp: Tue 2006-11-21 18:29:03 +1100
        message:
          Fix two trivial test failures.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.32
        merged: robertc at robertcollins.net-20061117001900-6c2be7c7934f74d8
        parent: robertc at robertcollins.net-20061117001712-f87f23b516fe9814
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-17 11:19:00 +1100
        message:
          Unescape urls before handing over the wire to the smart server for the probe_transport method.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.31
        merged: robertc at robertcollins.net-20061117001712-f87f23b516fe9814
        parent: robertc at robertcollins.net-20061117000942-5f38b7a179c42641
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-17 11:17:12 +1100
        message:
          Make RemoteBzrDir tests use a real smart transport connection to a read only server instance for read-only tests.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.30
        merged: robertc at robertcollins.net-20061117000942-5f38b7a179c42641
        parent: robertc at robertcollins.net-20061117000537-ab73c5d053cb65b5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-17 11:09:42 +1100
        message:
          Reenable the stock repository implementations for testing.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.29
        merged: robertc at robertcollins.net-20061117000537-ab73c5d053cb65b5
        parent: robertc at robertcollins.net-20061116193044-df4ff02c6f0e289a
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-17 11:05:37 +1100
        message:
          Dont run the vfat repository test on RemoteRepositories as there is no point.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.28
        merged: robertc at robertcollins.net-20061116193044-df4ff02c6f0e289a
        parent: robertc at robertcollins.net-20061116192335-6f5128786c709903
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-17 06:30:44 +1100
        message:
          Fix RemoteBzrDirFormat probe api usage.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.27
        merged: robertc at robertcollins.net-20061116192335-6f5128786c709903
        parent: andrew.bennetts at canonical.com-20061116020230-792552fcf4fc86a7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss
        timestamp: Fri 2006-11-17 06:23:35 +1100
        message:
          Fix usage of smart_client.call_with_body_bytes in RemoteTransport.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.26
        merged: andrew.bennetts at canonical.com-20061116020230-792552fcf4fc86a7
        parent: andrew.bennetts at canonical.com-20061115015627-e01121d1aa982d05
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: Register RemoteBzrDirFormat always.
        timestamp: Thu 2006-11-16 13:02:30 +1100
        message:
          Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.25
        merged: andrew.bennetts at canonical.com-20061115015627-e01121d1aa982d05
        parent: andrew.bennetts at canonical.com-20061115012708-2a2234d64afbfd42
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: Register RemoteBzrDirFormat always.
        timestamp: Wed 2006-11-15 12:56:27 +1100
        message:
          Make sure RemoteBzrDirFormat is always registered (John Arbash Meinel, Robert Collins, Andrew Bennetts).
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.24
        merged: andrew.bennetts at canonical.com-20061115012708-2a2234d64afbfd42
        parent: andrew.bennetts at canonical.com-20061114225707-35c7cfee464abb37
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: NO_SMART_VFS environment variable
        timestamp: Wed 2006-11-15 12:27:08 +1100
        message:
          Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.23
        merged: andrew.bennetts at canonical.com-20061114225707-35c7cfee464abb37
        parent: andrew.bennetts at canonical.com-20061114225451-79aee38a4790bc30
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-15 09:57:07 +1100
        message:
          Use a Registry for smart server command handlers.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.22
        merged: andrew.bennetts at canonical.com-20061114225451-79aee38a4790bc30
        parent: andrew.bennetts at canonical.com-20061114221015-cd275a3205ef8876
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-15 09:54:51 +1100
        message:
          Fix cmd_serve after move of bzrlib.transport.smart
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.21
        merged: andrew.bennetts at canonical.com-20061114221015-cd275a3205ef8876
        parent: andrew.bennetts at canonical.com-20061114201451-50fc10d6722cc329
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-15 09:10:15 +1100
        message:
          Move bzrlib.transport.smart to bzrlib.smart
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.20
        merged: andrew.bennetts at canonical.com-20061114201451-50fc10d6722cc329
        parent: andrew.bennetts at canonical.com-20061110104647-bfc9b83ef817a5a7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-15 07:14:51 +1100
        message:
          Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.19
        merged: andrew.bennetts at canonical.com-20061110104647-bfc9b83ef817a5a7
        parent: andrew.bennetts at canonical.com-20061110095814-50103d6e4f953d1a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-10 21:46:47 +1100
        message:
          Add docstrings to all the new modules, and a few other places.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.18
        merged: andrew.bennetts at canonical.com-20061110095814-50103d6e4f953d1a
        parent: andrew.bennetts at canonical.com-20061110090253-947df3118bb2933f
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-10 20:58:14 +1100
        message:
          Remove last non-global import of bzrlib.transport.smart.* from the split out code.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.17
        merged: andrew.bennetts at canonical.com-20061110090253-947df3118bb2933f
        parent: andrew.bennetts at canonical.com-20061110065239-3357f8a1930ad526
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-10 20:02:53 +1100
        message:
          Paramaterise the commands handled by SmartServerRequestHandler.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.16
        merged: andrew.bennetts at canonical.com-20061110065239-3357f8a1930ad526
        parent: andrew.bennetts at canonical.com-20061110064224-1d4511dddbacfbca
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-10 17:52:39 +1100
        message:
          Move SmartServerResponse to smart/request.py, untangling more import dependencies.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.15
        merged: andrew.bennetts at canonical.com-20061110064224-1d4511dddbacfbca
        parent: andrew.bennetts at canonical.com-20061110062216-5d8a2a58758f05f0
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-10 17:42:24 +1100
        message:
          Tidy some imports, and bugs introduced when adding server.py
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.14
        merged: andrew.bennetts at canonical.com-20061110062216-5d8a2a58758f05f0
        parent: andrew.bennetts at canonical.com-20061109050141-3832b8dd1930c841
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-10 17:22:16 +1100
        message:
          Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.13
        merged: andrew.bennetts at canonical.com-20061109050141-3832b8dd1930c841
        parent: andrew.bennetts at canonical.com-20061109050019-23216fc8e90cfe00
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 16:01:41 +1100
        message:
          Remove excessive blank lines.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.12
        merged: andrew.bennetts at canonical.com-20061109050019-23216fc8e90cfe00
        parent: andrew.bennetts at canonical.com-20061109043134-abef311bcac5bd46
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 16:00:19 +1100
        message:
          Rename SmartServerRequestHandler's command attribute to _command; it's private.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.11
        merged: andrew.bennetts at canonical.com-20061109043134-abef311bcac5bd46
        parent: andrew.bennetts at canonical.com-20061109043107-9ec3bdcacf63b06c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 15:31:34 +1100
        message:
          Remove obsolete comment.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.10
        merged: andrew.bennetts at canonical.com-20061109043107-9ec3bdcacf63b06c
        parent: andrew.bennetts at canonical.com-20061109043040-2e4e7b5d9933766c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 15:31:07 +1100
        message:
          Remove useless comments.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.9
        merged: andrew.bennetts at canonical.com-20061109043040-2e4e7b5d9933766c
        parent: andrew.bennetts at canonical.com-20061109042832-7b472545e11506fd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 15:30:40 +1100
        message:
          Remove some more dead code.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.8
        merged: andrew.bennetts at canonical.com-20061109042832-7b472545e11506fd
        parent: andrew.bennetts at canonical.com-20061109042410-2ec48953f7ed20ce
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 15:28:32 +1100
        message:
          Remove SmartServerRequest.response; commands can simply return the response from either do or do_body now.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.7
        merged: andrew.bennetts at canonical.com-20061109042410-2ec48953f7ed20ce
        parent: andrew.bennetts at canonical.com-20061108101448-ffae384a676d2592
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Thu 2006-11-09 15:24:10 +1100
        message:
          Simplify dispatch_command.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.6
        merged: andrew.bennetts at canonical.com-20061108101448-ffae384a676d2592
        parent: andrew.bennetts at canonical.com-20061108100112-4375099e84117e51
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-08 21:14:48 +1100
        message:
          Tidy ups, and turn do_hello and do_get_bundle into command objects.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.5
        merged: andrew.bennetts at canonical.com-20061108100112-4375099e84117e51
        parent: andrew.bennetts at canonical.com-20061108095724-29af1e1abcf5cc87
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-08 21:01:12 +1100
        message:
          Pass body_bytes directly to SmartServerRequest.do_body
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.4
        merged: andrew.bennetts at canonical.com-20061108095724-29af1e1abcf5cc87
        parent: andrew.bennetts at canonical.com-20061108035508-333440d39865078c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-08 20:57:24 +1100
        message:
          Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.3
        merged: andrew.bennetts at canonical.com-20061108035508-333440d39865078c
        parent: andrew.bennetts at canonical.com-20061103051926-09b9bc4657c50038
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Wed 2006-11-08 14:55:08 +1100
        message:
          Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.2
        merged: andrew.bennetts at canonical.com-20061103051926-09b9bc4657c50038
        parent: andrew.bennetts at canonical.com-20061101095656-88d3e7014bb0ce63
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split smart
        timestamp: Fri 2006-11-03 16:19:26 +1100
        message:
          Start splitting bzrlib/transport/smart.py into a package.
        ------------------------------------------------------------
        revno: 2018.1.11.1.25.1.13.1.1
        merged: andrew.bennetts at canonical.com-20061101095656-88d3e7014bb0ce63
        parent: andrew.bennetts at canonical.com-20061018060759-6a590c7a6c04b360
        parent: andrew.bennetts at canonical.com-20061101094905-2690b01c9e75ebfa
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: split-smart
        timestamp: Wed 2006-11-01 20:56:56 +1100
        message:
          Merge from remote-transport
        ------------------------------------------------------------
        revno: 1752.2.90
        merged: andrew.bennetts at canonical.com-20061101094905-2690b01c9e75ebfa
        parent: andrew.bennetts at canonical.com-20061101094808-98f7a769f2499b06
        parent: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-11-01 20:49:05 +1100
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 1752.2.89
        merged: andrew.bennetts at canonical.com-20061101094808-98f7a769f2499b06
        parent: andrew.bennetts at canonical.com-20061027074809-ce65588d897aa851
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-11-01 20:48:08 +1100
        message:
          Skip test_upgrade_from_format4 for RemoteRepositoryFormat.
        ------------------------------------------------------------
        revno: 1752.2.88
        merged: andrew.bennetts at canonical.com-20061027074809-ce65588d897aa851
        parent: andrew.bennetts at canonical.com-20061027045922-843414bdbc432164
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-10-27 17:48:09 +1000
        message:
          Trim some comment cruft.
        ------------------------------------------------------------
        revno: 1752.2.87
        merged: andrew.bennetts at canonical.com-20061027045922-843414bdbc432164
        parent: andrew.bennetts at canonical.com-20061020040248-80ca63c7e0a13298
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-10-27 14:59:22 +1000
        message:
          Make tests pass.
        ------------------------------------------------------------
        revno: 1752.2.86
        merged: andrew.bennetts at canonical.com-20061020040248-80ca63c7e0a13298
        parent: andrew.bennetts at canonical.com-20061009045436-6febebf1c571ed17
        parent: pqm at pqm.ubuntu.com-20061019063255-f052e82e226066a0
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-10-20 14:02:48 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 1752.2.85
        merged: andrew.bennetts at canonical.com-20061009045436-6febebf1c571ed17
        parent: andrew.bennetts at canonical.com-20060917082244-f3a2e5dcd6e87b36
        parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Mon 2006-10-09 14:54:36 +1000
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.84
        merged: andrew.bennetts at canonical.com-20060917082244-f3a2e5dcd6e87b36
        parent: andrew.bennetts at canonical.com-20060913140829-e8fc75a832057416
        parent: robertc at robertcollins.net-20060915123116-2151853564521d8f
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Sun 2006-09-17 18:22:44 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.83
        merged: andrew.bennetts at canonical.com-20060913140829-e8fc75a832057416
        parent: andrew.bennetts at canonical.com-20060913070250-e3ea2c0e7d58433b
        parent: andrew.bennetts at canonical.com-20060913134321-ad198def5d41790e
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Thu 2006-09-14 00:08:29 +1000
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.82
        merged: andrew.bennetts at canonical.com-20060913070250-e3ea2c0e7d58433b
        parent: andrew.bennetts at canonical.com-20060912080707-b522f3cedce06212
        parent: andrew.bennetts at canonical.com-20060913065325-4ddfffce8d31f00d
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-09-13 17:02:50 +1000
        message:
          Merge smart transport improvements.
        ------------------------------------------------------------
        revno: 1752.2.81
        merged: andrew.bennetts at canonical.com-20060912080707-b522f3cedce06212
        parent: andrew.bennetts at canonical.com-20060829054101-e08d300913a1ae41
        parent: andrew.bennetts at canonical.com-20060912064751-6a7029b08372ee0e
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-09-12 18:07:07 +1000
        message:
          Merge cleaned up underlying dependencies for remote bzrdir.
        ------------------------------------------------------------
        revno: 1752.2.80
        merged: andrew.bennetts at canonical.com-20060829054101-e08d300913a1ae41
        parent: andrew.bennetts at canonical.com-20060829033913-a907394320a45228
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-29 15:41:01 +1000
        message:
          Some urlquoting fixes, a double-slash fix, a fix for an incorrect test (still failing though) and remove an apparently obsolete comment.
        ------------------------------------------------------------
        revno: 1752.2.79
        merged: andrew.bennetts at canonical.com-20060829033913-a907394320a45228
        parent: andrew.bennetts at canonical.com-20060829014055-6c7765df32d398b9
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-29 13:39:13 +1000
        message:
          URL escaping fixes that somehow got lost in conflict resolution.
        ------------------------------------------------------------
        revno: 1752.2.78
        merged: andrew.bennetts at canonical.com-20060829014055-6c7765df32d398b9
        parent: andrew.bennetts at canonical.com-20060825042337-b913098a7dee77cb
        parent: andrew.bennetts at canonical.com-20060829013958-3dcc275cd414b1a1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-29 11:40:55 +1000
        message:
          Merge from bzr.dev.
            ------------------------------------------------------------
            revno: 1752.2.41.1.18
            merged: andrew.bennetts at canonical.com-20060829013958-3dcc275cd414b1a1
            parent: andrew.bennetts at canonical.com-20060825042147-21e24db05f61004b
            parent: andrew.bennetts at canonical.com-20060829013947-139e5fed102a23c2
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Tue 2006-08-29 11:39:58 +1000
            message:
              Merge from bzr.dev.
            ------------------------------------------------------------
            revno: 1752.2.41.1.14.1.4
            merged: andrew.bennetts at canonical.com-20060829013947-139e5fed102a23c2
            parent: andrew.bennetts at canonical.com-20060825042137-f131957a24998af8
            parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Tue 2006-08-29 11:39:47 +1000
            message:
              Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 1752.2.77
        merged: andrew.bennetts at canonical.com-20060825042337-b913098a7dee77cb
        parent: andrew.bennetts at canonical.com-20060824013856-dc34dcd68584aa3e
        parent: andrew.bennetts at canonical.com-20060825042147-21e24db05f61004b
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-25 14:23:37 +1000
        message:
          Merge from sftp refactoring 2.
            ------------------------------------------------------------
            revno: 1752.2.41.1.17
            merged: andrew.bennetts at canonical.com-20060825042147-21e24db05f61004b
            parent: andrew.bennetts at canonical.com-20060823035332-f70dd0b12d394a52
            parent: andrew.bennetts at canonical.com-20060825042137-f131957a24998af8
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Fri 2006-08-25 14:21:47 +1000
            message:
              Merge from sftp refactoring 2.
            ------------------------------------------------------------
            revno: 1752.2.41.1.14.1.3
            merged: andrew.bennetts at canonical.com-20060825042137-f131957a24998af8
            parent: andrew.bennetts at canonical.com-20060823035326-d9d7cc6b9d2b0bc7
            parent: andrew.bennetts at canonical.com-20060825042046-7f1cb13726dc6c06
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Fri 2006-08-25 14:21:37 +1000
            message:
              Merge from sftp refactoring 2.
        ------------------------------------------------------------
        revno: 1752.2.76
        merged: andrew.bennetts at canonical.com-20060824013856-dc34dcd68584aa3e
        parent: andrew.bennetts at canonical.com-20060823131948-7035572a1281b5f1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Thu 2006-08-24 11:38:56 +1000
        message:
          Move lazy-connection logic into SmartStreamClient.
        ------------------------------------------------------------
        revno: 1752.2.75
        merged: andrew.bennetts at canonical.com-20060823131948-7035572a1281b5f1
        parent: andrew.bennetts at canonical.com-20060823111354-f57cfa43a1397425
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 23:19:48 +1000
        message:
          Add XXX about lazy connection making.
        ------------------------------------------------------------
        revno: 1752.2.74
        merged: andrew.bennetts at canonical.com-20060823111354-f57cfa43a1397425
        parent: andrew.bennetts at canonical.com-20060823105658-10d57b3d1b7329fc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 21:13:54 +1000
        message:
          Make SmartTransport.clone return the right class, and move connection sharing into clone from __init__.
        ------------------------------------------------------------
        revno: 1752.2.73
        merged: andrew.bennetts at canonical.com-20060823105658-10d57b3d1b7329fc
        parent: andrew.bennetts at canonical.com-20060823055908-d6194c6c666c8ce6
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 20:56:58 +1000
        message:
          Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
        ------------------------------------------------------------
        revno: 1752.2.72
        merged: andrew.bennetts at canonical.com-20060823055908-d6194c6c666c8ce6
        parent: andrew.bennetts at canonical.com-20060823035337-35b78d67b08f7633
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 15:59:08 +1000
        message:
          Make Remote* classes in remote.py more consistent and remove some dead code.
        ------------------------------------------------------------
        revno: 1752.2.71
        merged: andrew.bennetts at canonical.com-20060823035337-35b78d67b08f7633
        parent: andrew.bennetts at canonical.com-20060823034826-1111a81f2f27d0a2
        parent: andrew.bennetts at canonical.com-20060823035332-f70dd0b12d394a52
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 13:53:37 +1000
        message:
          Merge from test tweaks
            ------------------------------------------------------------
            revno: 1752.2.41.1.16
            merged: andrew.bennetts at canonical.com-20060823035332-f70dd0b12d394a52
            parent: andrew.bennetts at canonical.com-20060823034816-eed715441e0c3ec1
            parent: andrew.bennetts at canonical.com-20060823035326-d9d7cc6b9d2b0bc7
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-23 13:53:32 +1000
            message:
              Merge from test tweaks
            ------------------------------------------------------------
            revno: 1752.2.41.1.14.1.2
            merged: andrew.bennetts at canonical.com-20060823035326-d9d7cc6b9d2b0bc7
            parent: andrew.bennetts at canonical.com-20060823034808-5012694749e15165
            parent: andrew.bennetts at canonical.com-20060823035321-c05a07751e7a0611
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-23 13:53:26 +1000
            message:
              Merge from test tweaks
        ------------------------------------------------------------
        revno: 1752.2.70
        merged: andrew.bennetts at canonical.com-20060823034826-1111a81f2f27d0a2
        parent: andrew.bennetts at canonical.com-20060823032615-f744598ab1f11165
        parent: andrew.bennetts at canonical.com-20060823034816-eed715441e0c3ec1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 13:48:26 +1000
        message:
          Merge from test tweaks
            ------------------------------------------------------------
            revno: 1752.2.41.1.15
            merged: andrew.bennetts at canonical.com-20060823034816-eed715441e0c3ec1
            parent: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
            parent: andrew.bennetts at canonical.com-20060823034808-5012694749e15165
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-23 13:48:16 +1000
            message:
              Merge from test tweaks
            ------------------------------------------------------------
            revno: 1752.2.41.1.14.1.1
            merged: andrew.bennetts at canonical.com-20060823034808-5012694749e15165
            parent: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
            parent: andrew.bennetts at canonical.com-20060823034524-002552c75ec7f81e
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-23 13:48:08 +1000
            message:
              Merge from test tweaks
        ------------------------------------------------------------
        revno: 1752.2.69
        merged: andrew.bennetts at canonical.com-20060823032615-f744598ab1f11165
        parent: andrew.bennetts at canonical.com-20060823031526-cc49126a7a08dd29
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 13:26:15 +1000
        message:
          Guard RemoteBzrDirFormat.__eq__ with an isinstance check.
        ------------------------------------------------------------
        revno: 1752.2.68
        merged: andrew.bennetts at canonical.com-20060823031526-cc49126a7a08dd29
        parent: andrew.bennetts at canonical.com-20060823030804-e5812d75252db56f
        parent: andrew.bennetts at canonical.com-20060823031520-8099305ab9ac19bf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 13:15:26 +1000
        message:
          Merge from high performance smart server
            ------------------------------------------------------------
            revno: 1752.2.42.1.14
            merged: andrew.bennetts at canonical.com-20060823031520-8099305ab9ac19bf
            parent: andrew.bennetts at canonical.com-20060823030754-8d459af6d1db884e
            parent: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-23 13:15:20 +1000
            message:
              Merge from high performance smart server
            ------------------------------------------------------------
            revno: 1752.2.41.1.14
            merged: andrew.bennetts at canonical.com-20060823031453-fd940d410d6c8199
            parent: andrew.bennetts at canonical.com-20060823030748-e3e3b17effc80dc9
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-23 13:14:53 +1000
            message:
              Fix shallow bug (bad conflict resolution?) in errors.UnsupportedEOLMarker
        ------------------------------------------------------------
        revno: 1752.2.67
        merged: andrew.bennetts at canonical.com-20060823030804-e5812d75252db56f
        parent: andrew.bennetts at canonical.com-20060821081826-908982fcdc0e67a7
        parent: andrew.bennetts at canonical.com-20060823030754-8d459af6d1db884e
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-23 13:08:04 +1000
        message:
          Merge from bzr.dev
            ------------------------------------------------------------
            revno: 1752.2.42.1.13
            merged: andrew.bennetts at canonical.com-20060823030754-8d459af6d1db884e
            parent: andrew.bennetts at canonical.com-20060821081610-0dc8587abc8bca5d
            parent: andrew.bennetts at canonical.com-20060823030748-e3e3b17effc80dc9
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-23 13:07:54 +1000
            message:
              Merge from bzr.dev
            ------------------------------------------------------------
            revno: 1752.2.41.1.13
            merged: andrew.bennetts at canonical.com-20060823030748-e3e3b17effc80dc9
            parent: andrew.bennetts at canonical.com-20060821081559-5a5b071e75120218
            parent: andrew.bennetts at canonical.com-20060823030742-0432ddd9a41acbac
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-23 13:07:48 +1000
            message:
              Merge from bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.66
        merged: andrew.bennetts at canonical.com-20060821081826-908982fcdc0e67a7
        parent: andrew.bennetts at canonical.com-20060816075127-298046537ac3794c
        parent: andrew.bennetts at canonical.com-20060821081610-0dc8587abc8bca5d
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Mon 2006-08-21 18:18:26 +1000
        message:
          Merge from bzr.dev.
            ------------------------------------------------------------
            revno: 1752.2.42.1.12
            merged: andrew.bennetts at canonical.com-20060821081610-0dc8587abc8bca5d
            parent: andrew.bennetts at canonical.com-20060816075122-1dd1e98944703a2e
            parent: andrew.bennetts at canonical.com-20060821081559-5a5b071e75120218
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Mon 2006-08-21 18:16:10 +1000
            message:
              Merge from bzr.dev.
            ------------------------------------------------------------
            revno: 1752.2.41.1.12
            merged: andrew.bennetts at canonical.com-20060821081559-5a5b071e75120218
            parent: andrew.bennetts at canonical.com-20060816075116-01c58dbf442bba9d
            parent: andrew.bennetts at canonical.com-20060821081202-8871ca6b89209e28
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Mon 2006-08-21 18:15:59 +1000
            message:
              Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 1752.2.65
        merged: andrew.bennetts at canonical.com-20060816075127-298046537ac3794c
        parent: andrew.bennetts at canonical.com-20060816071806-0154b6a44243f7b5
        parent: andrew.bennetts at canonical.com-20060816075122-1dd1e98944703a2e
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-16 17:51:27 +1000
        message:
          Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.42.1.11
            merged: andrew.bennetts at canonical.com-20060816075122-1dd1e98944703a2e
            parent: andrew.bennetts at canonical.com-20060816060808-23cdaf2e4478ac13
            parent: andrew.bennetts at canonical.com-20060816075116-01c58dbf442bba9d
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-16 17:51:22 +1000
            message:
              Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.41.1.11
            merged: andrew.bennetts at canonical.com-20060816075116-01c58dbf442bba9d
            parent: andrew.bennetts at canonical.com-20060816060803-73f52c4ac1a5c6c2
            parent: andrew.bennetts at canonical.com-20060816075110-8405df735e442ef3
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-16 17:51:16 +1000
            message:
              Merge from test-tweaks.
        ------------------------------------------------------------
        revno: 1752.2.64
        merged: andrew.bennetts at canonical.com-20060816071806-0154b6a44243f7b5
        parent: andrew.bennetts at canonical.com-20060816062317-7164e5faddd7ef0b
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-16 17:18:06 +1000
        message:
          Improve how RemoteBzrDir.open_branch works to handle references and not double-open repositories.
        ------------------------------------------------------------
        revno: 1752.2.63
        merged: andrew.bennetts at canonical.com-20060816062317-7164e5faddd7ef0b
        parent: andrew.bennetts at canonical.com-20060816061420-49cf31690d23607b
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-16 16:23:17 +1000
        message:
          Delegate set_parent.
        ------------------------------------------------------------
        revno: 1752.2.62
        merged: andrew.bennetts at canonical.com-20060816061420-49cf31690d23607b
        parent: andrew.bennetts at canonical.com-20060816060910-3e352be345adc843
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-16 16:14:20 +1000
        message:
          Add TODO
        ------------------------------------------------------------
        revno: 1752.2.61
        merged: andrew.bennetts at canonical.com-20060816060910-3e352be345adc843
        parent: andrew.bennetts at canonical.com-20060816044359-7e1481d784b80251
        parent: andrew.bennetts at canonical.com-20060816060808-23cdaf2e4478ac13
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-16 16:09:10 +1000
        message:
          Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.42.1.10
            merged: andrew.bennetts at canonical.com-20060816060808-23cdaf2e4478ac13
            parent: andrew.bennetts at canonical.com-20060816044349-d9d15c871ef8ca94
            parent: andrew.bennetts at canonical.com-20060816060803-73f52c4ac1a5c6c2
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-16 16:08:08 +1000
            message:
              Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.41.1.10
            merged: andrew.bennetts at canonical.com-20060816060803-73f52c4ac1a5c6c2
            parent: andrew.bennetts at canonical.com-20060816044252-96c8db58e2fd27e7
            parent: andrew.bennetts at canonical.com-20060816060755-c78362354f63d6ce
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-16 16:08:03 +1000
            message:
              Merge from test-tweaks.
        ------------------------------------------------------------
        revno: 1752.2.60
        merged: andrew.bennetts at canonical.com-20060816044359-7e1481d784b80251
        parent: andrew.bennetts at canonical.com-20060811070013-49ca62687d41dcc1
        parent: andrew.bennetts at canonical.com-20060816044349-d9d15c871ef8ca94
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-16 14:43:59 +1000
        message:
          Merge from bzr.dev
            ------------------------------------------------------------
            revno: 1752.2.42.1.9
            merged: andrew.bennetts at canonical.com-20060816044349-d9d15c871ef8ca94
            parent: andrew.bennetts at canonical.com-20060811070008-cde16276efb1a42c
            parent: andrew.bennetts at canonical.com-20060816044252-96c8db58e2fd27e7
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-16 14:43:49 +1000
            message:
              Merge from bzr.dev
            ------------------------------------------------------------
            revno: 1752.2.41.1.9
            merged: andrew.bennetts at canonical.com-20060816044252-96c8db58e2fd27e7
            parent: andrew.bennetts at canonical.com-20060811070003-b8eb84428c497293
            parent: andrew.bennetts at canonical.com-20060816043711-9f0277328a973692
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-16 14:42:52 +1000
            message:
              Merge from bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.59
        merged: andrew.bennetts at canonical.com-20060811070013-49ca62687d41dcc1
        parent: andrew.bennetts at canonical.com-20060811065856-7128aecf285d9fbd
        parent: andrew.bennetts at canonical.com-20060811070008-cde16276efb1a42c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-11 17:00:13 +1000
        message:
          Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.42.1.8
            merged: andrew.bennetts at canonical.com-20060811070008-cde16276efb1a42c
            parent: andrew.bennetts at canonical.com-20060811061024-b2bb8d9288466ca5
            parent: andrew.bennetts at canonical.com-20060811070003-b8eb84428c497293
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Fri 2006-08-11 17:00:08 +1000
            message:
              Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.41.1.8
            merged: andrew.bennetts at canonical.com-20060811070003-b8eb84428c497293
            parent: andrew.bennetts at canonical.com-20060811061019-e880c857ce2c6db8
            parent: andrew.bennetts at canonical.com-20060811065958-c5a025e340363cd3
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Fri 2006-08-11 17:00:03 +1000
            message:
              Merge from test-tweaks.
        ------------------------------------------------------------
        revno: 1752.2.58
        merged: andrew.bennetts at canonical.com-20060811065856-7128aecf285d9fbd
        parent: andrew.bennetts at canonical.com-20060811061033-556f8b46f5c98157
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-11 16:58:56 +1000
        message:
          Make SmartTransport.put accept strings as well as file-like objects.
        ------------------------------------------------------------
        revno: 1752.2.57
        merged: andrew.bennetts at canonical.com-20060811061033-556f8b46f5c98157
        parent: andrew.bennetts at canonical.com-20060811055831-70d2619a20dacb52
        parent: andrew.bennetts at canonical.com-20060811061024-b2bb8d9288466ca5
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-11 16:10:33 +1000
        message:
          Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.42.1.7
            merged: andrew.bennetts at canonical.com-20060811061024-b2bb8d9288466ca5
            parent: andrew.bennetts at canonical.com-20060810140614-4d8d0f67e8cf20ba
            parent: andrew.bennetts at canonical.com-20060811061019-e880c857ce2c6db8
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Fri 2006-08-11 16:10:24 +1000
            message:
              Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.41.1.7
            merged: andrew.bennetts at canonical.com-20060811061019-e880c857ce2c6db8
            parent: andrew.bennetts at canonical.com-20060810140603-4867b1cf1185375f
            parent: andrew.bennetts at canonical.com-20060811061006-964a36dfa7d697b2
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Fri 2006-08-11 16:10:19 +1000
            message:
              Merge from test-tweaks.
        ------------------------------------------------------------
        revno: 1752.2.56
        merged: andrew.bennetts at canonical.com-20060811055831-70d2619a20dacb52
        parent: andrew.bennetts at canonical.com-20060811042234-d124075c84cf2952
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-11 15:58:31 +1000
        message:
          Make RemoteBzrDir raise NotBranchError on open_branch regardless of whether a repository exists.
        ------------------------------------------------------------
        revno: 1752.2.55
        merged: andrew.bennetts at canonical.com-20060811042234-d124075c84cf2952
        parent: andrew.bennetts at canonical.com-20060810140623-32b82cb7b6ea1ef6
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-11 14:22:34 +1000
        message:
          Replace another isinstance(made_repo, Repository) check.
        ------------------------------------------------------------
        revno: 1752.2.54
        merged: andrew.bennetts at canonical.com-20060810140623-32b82cb7b6ea1ef6
        parent: andrew.bennetts at canonical.com-20060810134559-de169fa0f252d968
        parent: andrew.bennetts at canonical.com-20060810140614-4d8d0f67e8cf20ba
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Fri 2006-08-11 00:06:23 +1000
        message:
          Merge from test-tweaks
            ------------------------------------------------------------
            revno: 1752.2.42.1.6
            merged: andrew.bennetts at canonical.com-20060810140614-4d8d0f67e8cf20ba
            parent: andrew.bennetts at canonical.com-20060809053340-e40c5031035a3cb4
            parent: andrew.bennetts at canonical.com-20060810140603-4867b1cf1185375f
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Fri 2006-08-11 00:06:14 +1000
            message:
              Merge from test-tweaks
            ------------------------------------------------------------
            revno: 1752.2.41.1.6
            merged: andrew.bennetts at canonical.com-20060810140603-4867b1cf1185375f
            parent: andrew.bennetts at canonical.com-20060809053334-af89cab39e0b6043
            parent: andrew.bennetts at canonical.com-20060810135025-1105c1aaf5301044
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Fri 2006-08-11 00:06:03 +1000
            message:
              Merge from test-tweaks
        ------------------------------------------------------------
        revno: 1752.2.53
        merged: andrew.bennetts at canonical.com-20060810134559-de169fa0f252d968
        parent: andrew.bennetts at canonical.com-20060810015246-f155b70b3aecb0c4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Thu 2006-08-10 23:45:59 +1000
        message:
          Add an XXX comment to the test suite hack.
        ------------------------------------------------------------
        revno: 1752.2.52
        merged: andrew.bennetts at canonical.com-20060810015246-f155b70b3aecb0c4
        parent: andrew.bennetts at canonical.com-20060809053346-9828bf251a902895
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Thu 2006-08-10 11:52:46 +1000
        message:
          Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
        ------------------------------------------------------------
        revno: 1752.2.51
        merged: andrew.bennetts at canonical.com-20060809053346-9828bf251a902895
        parent: andrew.bennetts at canonical.com-20060809052723-1aeefb036ba10880
        parent: andrew.bennetts at canonical.com-20060809053340-e40c5031035a3cb4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-09 15:33:46 +1000
        message:
          Merge from trivial
            ------------------------------------------------------------
            revno: 1752.2.42.1.5
            merged: andrew.bennetts at canonical.com-20060809053340-e40c5031035a3cb4
            parent: andrew.bennetts at canonical.com-20060809050828-c7b48bb82475f2c3
            parent: andrew.bennetts at canonical.com-20060809053334-af89cab39e0b6043
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-09 15:33:40 +1000
            message:
              Merge from trivial
            ------------------------------------------------------------
            revno: 1752.2.41.1.5
            merged: andrew.bennetts at canonical.com-20060809053334-af89cab39e0b6043
            parent: andrew.bennetts at canonical.com-20060809050821-85ac3ff2b03fc545
            parent: andrew.bennetts at canonical.com-20060809053328-ccdb3e9a96032fc9
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-09 15:33:34 +1000
            message:
              Merge from trivial
        ------------------------------------------------------------
        revno: 1752.2.50
        merged: andrew.bennetts at canonical.com-20060809052723-1aeefb036ba10880
        parent: andrew.bennetts at canonical.com-20060809050834-41d4b6785c0a853a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-09 15:27:23 +1000
        message:
          Implement RemoteBzrDir.create_{branch,workingtree}
        ------------------------------------------------------------
        revno: 1752.2.49
        merged: andrew.bennetts at canonical.com-20060809050834-41d4b6785c0a853a
        parent: andrew.bennetts at canonical.com-20060808062053-162d53230017d464
        parent: andrew.bennetts at canonical.com-20060809050828-c7b48bb82475f2c3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Wed 2006-08-09 15:08:34 +1000
        message:
          Merge from old remote working tree initialisation
            ------------------------------------------------------------
            revno: 1752.2.42.1.4
            merged: andrew.bennetts at canonical.com-20060809050828-c7b48bb82475f2c3
            parent: andrew.bennetts at canonical.com-20060808061445-b033d13cbd32255e
            parent: andrew.bennetts at canonical.com-20060809050821-85ac3ff2b03fc545
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Wed 2006-08-09 15:08:28 +1000
            message:
              Merge from old remote working tree initialisation
            ------------------------------------------------------------
            revno: 1752.2.41.1.4
            merged: andrew.bennetts at canonical.com-20060809050821-85ac3ff2b03fc545
            parent: andrew.bennetts at canonical.com-20060808061436-4c17fcf4c1134540
            parent: andrew.bennetts at canonical.com-20060809050811-885fa7c9769a335f
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Wed 2006-08-09 15:08:21 +1000
            message:
              Merge from old remote working tree initialisation
        ------------------------------------------------------------
        revno: 1752.2.48
        merged: andrew.bennetts at canonical.com-20060808062053-162d53230017d464
        parent: andrew.bennetts at canonical.com-20060808061853-9153fa0d72fdf97f
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-08 16:20:53 +1000
        message:
          Support stat
        ------------------------------------------------------------
        revno: 1752.2.47
        merged: andrew.bennetts at canonical.com-20060808061853-9153fa0d72fdf97f
        parent: andrew.bennetts at canonical.com-20060808061458-9526a69776d67f71
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-08 16:18:53 +1000
        message:
          Fix SmartTransport.list_dir to return ascii.
        ------------------------------------------------------------
        revno: 1752.2.46
        merged: andrew.bennetts at canonical.com-20060808061458-9526a69776d67f71
        parent: andrew.bennetts at canonical.com-20060808060527-edb1f37cf4930fa2
        parent: andrew.bennetts at canonical.com-20060808061445-b033d13cbd32255e
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-08 16:14:58 +1000
        message:
          Merge from list_dir return type
            ------------------------------------------------------------
            revno: 1752.2.42.1.3
            merged: andrew.bennetts at canonical.com-20060808061445-b033d13cbd32255e
            parent: andrew.bennetts at canonical.com-20060808060428-d30bd4834b3c5ee2
            parent: andrew.bennetts at canonical.com-20060808061436-4c17fcf4c1134540
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Tue 2006-08-08 16:14:45 +1000
            message:
              Merge from list_dir return type
            ------------------------------------------------------------
            revno: 1752.2.41.1.3
            merged: andrew.bennetts at canonical.com-20060808061436-4c17fcf4c1134540
            parent: andrew.bennetts at canonical.com-20060808060220-7cdf6878defb0bda
            parent: andrew.bennetts at canonical.com-20060808061352-d7b8e85867309a8f
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Tue 2006-08-08 16:14:36 +1000
            message:
              Merge from list_dir return type
        ------------------------------------------------------------
        revno: 1752.2.45
        merged: andrew.bennetts at canonical.com-20060808060527-edb1f37cf4930fa2
        parent: andrew.bennetts at canonical.com-20060808045734-59e5ce5e81c7b697
        parent: andrew.bennetts at canonical.com-20060808060428-d30bd4834b3c5ee2
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-08 16:05:27 +1000
        message:
          Merge from list_dir return type
            ------------------------------------------------------------
            revno: 1752.2.42.1.2
            merged: andrew.bennetts at canonical.com-20060808060428-d30bd4834b3c5ee2
            parent: andrew.bennetts at canonical.com-20060808045654-884f72d359bd889a
            parent: andrew.bennetts at canonical.com-20060808060220-7cdf6878defb0bda
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Tue 2006-08-08 16:04:28 +1000
            message:
              Merge from list_dir return type
            ------------------------------------------------------------
            revno: 1752.2.41.1.2
            merged: andrew.bennetts at canonical.com-20060808060220-7cdf6878defb0bda
            parent: andrew.bennetts at canonical.com-20060808045617-d612899bb65d39bf
            parent: andrew.bennetts at canonical.com-20060808055529-3e6de5268b3d7cc7
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Tue 2006-08-08 16:02:20 +1000
            message:
              Merge from list_dir return type
        ------------------------------------------------------------
        revno: 1752.2.44
        merged: andrew.bennetts at canonical.com-20060808045734-59e5ce5e81c7b697
        parent: andrew.bennetts at canonical.com-20060808045253-800b1d99353e6a14
        parent: andrew.bennetts at canonical.com-20060808045654-884f72d359bd889a
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-08 14:57:34 +1000
        message:
          Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.42.1.1
            merged: andrew.bennetts at canonical.com-20060808045654-884f72d359bd889a
            parent: andrew.bennetts at canonical.com-20060808043657-8016f950877b12e6
            parent: andrew.bennetts at canonical.com-20060808045617-d612899bb65d39bf
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: add list_dir to smart transport
            timestamp: Tue 2006-08-08 14:56:54 +1000
            message:
              Merge from test-tweaks.
            ------------------------------------------------------------
            revno: 1752.2.41.1.1
            merged: andrew.bennetts at canonical.com-20060808045617-d612899bb65d39bf
            parent: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
            parent: andrew.bennetts at canonical.com-20060808045418-aa1b64d384cff417
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: high performance smart server
            timestamp: Tue 2006-08-08 14:56:17 +1000
            message:
              Merge from test-tweaks.
        ------------------------------------------------------------
        revno: 1752.2.43
        merged: andrew.bennetts at canonical.com-20060808045253-800b1d99353e6a14
        parent: andrew.bennetts at canonical.com-20060808043657-8016f950877b12e6
        parent: andrew.bennetts at canonical.com-20060808044415-c45ae6190e1acc50
        parent: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote bzrdir
        timestamp: Tue 2006-08-08 14:52:53 +1000
        message:
          Fix get_{branch,repository,workingtree}_transport.
        ------------------------------------------------------------
        revno: 1752.2.42
        merged: andrew.bennetts at canonical.com-20060808043657-8016f950877b12e6
        parent: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: add list_dir to smart transport
        timestamp: Tue 2006-08-08 14:36:57 +1000
        message:
          Add list_dir and iter_files_recursive smart transport
        ------------------------------------------------------------
        revno: 1752.2.41
        merged: andrew.bennetts at canonical.com-20060808023638-3c641d1830ffae7c
        parent: andrew.bennetts at canonical.com-20060808022431-b6502cd7cd89993d
        parent: andrew.bennetts at canonical.com-20060808023124-acc195a4317a5217
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: high performance smart server
        timestamp: Tue 2006-08-08 12:36:38 +1000
        message:
          Merge trivial change.
        ------------------------------------------------------------
        revno: 1752.2.40
        merged: andrew.bennetts at canonical.com-20060808022431-b6502cd7cd89993d
        parent: mbp at sourcefrog.net-20060727082448-9ce17c5605763cb2
        parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: high performance smart server
        timestamp: Tue 2006-08-08 12:24:31 +1000
        message:
          Merge from bzr.dev.
        ------------------------------------------------------------
        revno: 1752.2.39
        merged: mbp at sourcefrog.net-20060727082448-9ce17c5605763cb2
        parent: mbp at sourcefrog.net-20060727074733-24a4872fb9c53486
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: high performance smart server
        timestamp: Thu 2006-07-27 18:24:48 +1000
        message:
          [broken] implement upgrade apis on remote bzrdirs
        ------------------------------------------------------------
        revno: 1752.2.38
        merged: mbp at sourcefrog.net-20060727074733-24a4872fb9c53486
        parent: mbp at sourcefrog.net-20060726054840-d3344049249fe894
        parent: mbp at sourcefrog.net-20060727073915-0a90554790f072f0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: high performance smart server
        timestamp: Thu 2006-07-27 17:47:33 +1000
        message:
          [merge] fixes for make_bzrdir etc
            ------------------------------------------------------------
            revno: 1883.2.1
            merged: mbp at sourcefrog.net-20060727073915-0a90554790f072f0
            parent: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
            committer: Martin Pool <mbp at sourcefrog.net>
            branch nick: selftest make_bzrdir should use transport
            timestamp: Thu 2006-07-27 17:39:15 +1000
            message:
              make_bzrdir and make_branch now work on transports that aren't backed by local
              disk.
              
              Fix TestCase.get_url() so that it always returns either a path or a url, not
              an invalid melange of both escaping rules.
        ------------------------------------------------------------
        revno: 1752.2.37
        merged: mbp at sourcefrog.net-20060726054840-d3344049249fe894
        parent: mbp at sourcefrog.net-20060724042820-1b38096641f0207d
        parent: pqm at pqm.ubuntu.com-20060725010654-26e7af8135b2f44c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: high performance smart server
        timestamp: Wed 2006-07-26 15:48:40 +1000
        message:
          [broken] merge from bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.36
        merged: mbp at sourcefrog.net-20060724042820-1b38096641f0207d
        parent: mbp at sourcefrog.net-20060724042754-cf0ce2d60ca3c6a0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-07-24 14:28:20 +1000
        message:
          More hpss transport-like operations
        ------------------------------------------------------------
        revno: 1752.2.35
        merged: mbp at sourcefrog.net-20060724042754-cf0ce2d60ca3c6a0
        parent: mbp at sourcefrog.net-20060724033842-bc1bbeb746a824ef
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-07-24 14:27:54 +1000
        message:
          Transport test cleanups
          
          Parameter to put() should be file-like, not a string.
          
          Don't use stat() when has() will do.
        ------------------------------------------------------------
        revno: 1752.2.34
        merged: mbp at sourcefrog.net-20060724033842-bc1bbeb746a824ef
        parent: mbp at sourcefrog.net-20060724032140-cdbbeab89c2a006f
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-07-24 13:38:42 +1000
        message:
          Allow Transport.lock_read and lock_write to be not possible
        ------------------------------------------------------------
        revno: 1752.2.33
        merged: mbp at sourcefrog.net-20060724032140-cdbbeab89c2a006f
        parent: mbp at sourcefrog.net-20060723235856-bef582197b5cfc9b
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-07-24 13:21:40 +1000
        message:
          [broken] more hpss methods and adapt to bzrdir tests
        ------------------------------------------------------------
        revno: 1752.2.32
        merged: mbp at sourcefrog.net-20060723235856-bef582197b5cfc9b
        parent: mbp at sourcefrog.net-20060723235045-3af213a793216784
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-07-24 09:58:56 +1000
        message:
          [broken] Run smart server connections in separate threads.
          
          The test suite assumes servers will allow multiple simultaneous connections.
        ------------------------------------------------------------
        revno: 1752.2.31
        merged: mbp at sourcefrog.net-20060723235045-3af213a793216784
        parent: mbp at sourcefrog.net-20060720110338-9b51dc9d5e67c08d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-07-24 09:50:45 +1000
        message:
          [broken] some support for write operations over hpss
        ------------------------------------------------------------
        revno: 1752.2.30
        merged: mbp at sourcefrog.net-20060720110338-9b51dc9d5e67c08d
        parent: mbp at sourcefrog.net-20060720103537-dd993f46ddeec977
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-20 21:03:38 +1000
        message:
          Start adding a RemoteBzrDir, etc
        ------------------------------------------------------------
        revno: 1752.2.29
        merged: mbp at sourcefrog.net-20060720103537-dd993f46ddeec977
        parent: mbp at sourcefrog.net-20060720061357-dd104c7ebe302f27
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-20 20:35:37 +1000
        message:
          Factor out BzrDir.open_from_transport()
        ------------------------------------------------------------
        revno: 1752.2.28
        merged: mbp at sourcefrog.net-20060720061357-dd104c7ebe302f27
        parent: mbp at sourcefrog.net-20060720051118-b9c7e1ad249095e8
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-20 16:13:57 +1000
        message:
          Change all classes to SmartServer, etc; other cleanups
        ------------------------------------------------------------
        revno: 1752.2.27
        merged: mbp at sourcefrog.net-20060720051118-b9c7e1ad249095e8
        parent: mbp at sourcefrog.net-20060720050307-fb5495f8f70d941c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-20 15:11:18 +1000
        message:
          Separate more smart server operations into a separate client class
        ------------------------------------------------------------
        revno: 1752.2.26
        merged: mbp at sourcefrog.net-20060720050307-fb5495f8f70d941c
        parent: mbp at sourcefrog.net-20060719071534-52f79afc25f5d44b
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-20 15:03:07 +1000
        message:
          test_read_bundle doesn't need to specially hold a connection open anymore
        ------------------------------------------------------------
        revno: 1752.2.25
        merged: mbp at sourcefrog.net-20060719071534-52f79afc25f5d44b
        parent: mbp at sourcefrog.net-20060713084330-71c87c24d7b4e30b
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Wed 2006-07-19 17:15:34 +1000
        message:
          Better url error message, doc
        ------------------------------------------------------------
        revno: 1752.2.24
        merged: mbp at sourcefrog.net-20060713084330-71c87c24d7b4e30b
        parent: mbp at sourcefrog.net-20060713080053-fb3c173a141a408a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-13 18:43:30 +1000
        message:
          Fix up souk url handling during selftest
          
          Server now treats paths as fs-absolute, as if it were run from ssh
          
          Also some docs on future work
        ------------------------------------------------------------
        revno: 1752.2.23
        merged: mbp at sourcefrog.net-20060713080053-fb3c173a141a408a
        parent: mbp at sourcefrog.net-20060713075546-b6b730c77e8f1ac5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-13 18:00:53 +1000
        message:
          Fix up reporting of bzr protocol errors
        ------------------------------------------------------------
        revno: 1752.2.22
        merged: mbp at sourcefrog.net-20060713075546-b6b730c77e8f1ac5
        parent: mbp at sourcefrog.net-20060713071910-a10b703162003f0a
        parent: pqm at pqm.ubuntu.com-20060712215300-126aea223e34b65c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-13 17:55:46 +1000
        message:
          merge up with bzr.dev
        ------------------------------------------------------------
        revno: 1752.2.21
        merged: mbp at sourcefrog.net-20060713071910-a10b703162003f0a
        parent: mbp at sourcefrog.net-20060621075603-d6761c384e5abcea
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-07-13 17:19:10 +1000
        message:
          Small cleanup for tests
        ------------------------------------------------------------
        revno: 1752.2.20
        merged: mbp at sourcefrog.net-20060621075603-d6761c384e5abcea
        parent: mbp at sourcefrog.net-20060621060301-3f6bebead3c9bbcd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Wed 2006-06-21 17:56:03 +1000
        message:
          Reorganize SoukServer; implement basic get_bundle command.
        ------------------------------------------------------------
        revno: 1752.2.19
        merged: mbp at sourcefrog.net-20060621060301-3f6bebead3c9bbcd
        parent: mbp at sourcefrog.net-20060621054811-3f46266f5f5372f8
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Wed 2006-06-21 16:03:01 +1000
        message:
          Cleanup SFTPUrlHandling._unparse_url and callers
        ------------------------------------------------------------
        revno: 1752.2.18
        merged: mbp at sourcefrog.net-20060621054811-3f46266f5f5372f8
        parent: mbp at sourcefrog.net-20060613083049-1908f2f4b2a0f707
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Wed 2006-06-21 15:48:11 +1000
        message:
          Formatting cleanups & docstrings
        ------------------------------------------------------------
        revno: 1752.2.17
        merged: mbp at sourcefrog.net-20060613083049-1908f2f4b2a0f707
        parent: mbp at sourcefrog.net-20060613080740-fa9a5c9d58ef6118
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 18:30:49 +1000
        message:
          Get rid of old debug statements
        ------------------------------------------------------------
        revno: 1752.2.16
        merged: mbp at sourcefrog.net-20060613080740-fa9a5c9d58ef6118
        parent: mbp at sourcefrog.net-20060613075434-364388512cc028e6
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 18:07:40 +1000
        message:
          More fiddling with Souk transport paths
        ------------------------------------------------------------
        revno: 1752.2.15
        merged: mbp at sourcefrog.net-20060613075434-364388512cc028e6
        parent: mbp at sourcefrog.net-20060613073909-05cdbb8837ff05b7
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 17:54:34 +1000
        message:
          Remove LoopbackSoukConnection and cleanup tests.
          
          Now more consistent with how other transports are tested
        ------------------------------------------------------------
        revno: 1752.2.14
        merged: mbp at sourcefrog.net-20060613073909-05cdbb8837ff05b7
        parent: mbp at sourcefrog.net-20060613070553-82773518b7b911d4
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 17:39:09 +1000
        message:
          Trying to clarify handling of paths in souk protocol
        ------------------------------------------------------------
        revno: 1752.2.13
        merged: mbp at sourcefrog.net-20060613070553-82773518b7b911d4
        parent: mbp at sourcefrog.net-20060613023737-14b21a22c3162b1d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 17:05:53 +1000
        message:
          New bzr serve --port option
        ------------------------------------------------------------
        revno: 1752.2.12
        merged: mbp at sourcefrog.net-20060613023737-14b21a22c3162b1d
        parent: mbp at sourcefrog.net-20060613015110-95485abc6dc722e0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 12:37:37 +1000
        message:
          New 'bzr serve --inet' runs souk server.
          
          This is intended to be run across SSH.
          
          Change buffering to work properly in this case.
        ------------------------------------------------------------
        revno: 1752.2.11
        merged: mbp at sourcefrog.net-20060613015110-95485abc6dc722e0
        parent: mbp at sourcefrog.net-20060613014043-4ef82e3a11f09f2d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 11:51:10 +1000
        message:
          Rename from ssh to souk; most of this is not ssh-specific
        ------------------------------------------------------------
        revno: 1752.2.10
        merged: mbp at sourcefrog.net-20060613014043-4ef82e3a11f09f2d
        parent: mbp at sourcefrog.net-20060613005316-a7100dc4096ae2ab
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 11:40:43 +1000
        message:
          Get souk-over-tcp passing transport tests.
          
          Rename ssh-specific classes to Souk.
          
          Transports may indicate failure to connect from their constructor.
          
          Register bzr:// transport.
          
          Raise better error on failure to connect to souk server.
        ------------------------------------------------------------
        revno: 1752.2.9
        merged: mbp at sourcefrog.net-20060613005316-a7100dc4096ae2ab
        parent: mbp at sourcefrog.net-20060612123914-9e23b388623b6e23
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Tue 2006-06-13 10:53:16 +1000
        message:
          Rename smart protocol to souk; start a simple tcp server
        ------------------------------------------------------------
        revno: 1752.2.8
        merged: mbp at sourcefrog.net-20060612123914-9e23b388623b6e23
        parent: mbp at sourcefrog.net-20060612080529-9ba6ca259a740a99
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-06-12 22:39:14 +1000
        message:
          Enable more ssh tests.
        ------------------------------------------------------------
        revno: 1752.2.7
        merged: mbp at sourcefrog.net-20060612080529-9ba6ca259a740a99
        parent: mbp at sourcefrog.net-20060612074137-5415381d179464fe
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-06-12 18:05:29 +1000
        message:
          SSH transport can now change directories and passes absolute paths.
        ------------------------------------------------------------
        revno: 1752.2.6
        merged: mbp at sourcefrog.net-20060612074137-5415381d179464fe
        parent: mbp at sourcefrog.net-20060612064523-fd104e2ed22f5e4f
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-06-12 17:41:37 +1000
        message:
          Fix and simplify MemoryTransport abspath code
        ------------------------------------------------------------
        revno: 1752.2.5
        merged: mbp at sourcefrog.net-20060612064523-fd104e2ed22f5e4f
        parent: mbp at sourcefrog.net-20060611025000-3858575df398c073
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Mon 2006-06-12 16:45:23 +1000
        message:
          Add test for clone behaviour on SSHConnection
        ------------------------------------------------------------
        revno: 1752.2.4
        merged: mbp at sourcefrog.net-20060611025000-3858575df398c073
        parent: mbp at sourcefrog.net-20060609000239-4fbe1c12ea0e551d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Sun 2006-06-11 12:50:00 +1000
        message:
          Refactor SFTP transport to allow code sharing with SSH.
          
          Both use similar URL forms so move that to a common superclass.
          
          Start adding some SSH tests for URL handling, currently disabled.
          
          Clean up tests that assume URL returns are unicode, not 8-bit,
        ------------------------------------------------------------
        revno: 1752.2.3
        merged: mbp at sourcefrog.net-20060609000239-4fbe1c12ea0e551d
        parent: mbp at sourcefrog.net-20060608233220-5d09725cc822399b
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Fri 2006-06-09 01:02:39 +0100
        message:
          (ssh) more development of error handling
        ------------------------------------------------------------
        revno: 1752.2.2
        merged: mbp at sourcefrog.net-20060608233220-5d09725cc822399b
        parent: mbp at sourcefrog.net-20060608204941-7e61050c6d73bed5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Fri 2006-06-09 00:32:20 +0100
        message:
          SSH get method; more development of framework.
        ------------------------------------------------------------
        revno: 1752.2.1
        merged: mbp at sourcefrog.net-20060608204941-7e61050c6d73bed5
        parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.ssh
        timestamp: Thu 2006-06-08 21:49:41 +0100
        message:
          Start implementation of a simple ssh server.
          
           - test infrastructure
           - act as a trivial Transport that can answer has()
          
          (With thanks to robertc)
    ------------------------------------------------------------
    revno: 2432.1.2
    merged: pqm at pqm.ubuntu.com-20070420080902-6kdj9s5jhwq4sm7v
    parent: pqm at pqm.ubuntu.com-20070420074025-f3uyko3oai8bj5td
    parent: robertc at robertcollins.net-20070420073820-iulf74ans1v2fn8e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-20 09:09:02 +0100
    message:
      (robertc) Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
        ------------------------------------------------------------
        revno: 2400.2.4
        merged: robertc at robertcollins.net-20070420073820-iulf74ans1v2fn8e
        parent: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: misc-fixen
        timestamp: Fri 2007-04-20 17:38:20 +1000
        message:
          (robertc) Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
    ------------------------------------------------------------
    revno: 2432.1.1
    merged: pqm at pqm.ubuntu.com-20070420074025-f3uyko3oai8bj5td
    parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
    parent: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-20 08:40:25 +0100
    message:
      (robertc) Two minor misc-fixes.
    ------------------------------------------------------------
    revno: 2400.2.3
    merged: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
    parent: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
    parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: misc-fixen
    timestamp: Fri 2007-04-20 17:06:54 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2400.2.2
    merged: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
    parent: robertc at robertcollins.net-20070405030706-9zpyygdfimm020u8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: misc-fixen
    timestamp: Thu 2007-04-05 18:44:49 +1000
    message:
      Document BzrDir.open_workingtree's new recommend_upgrade parameter.
    ------------------------------------------------------------
    revno: 2400.2.1
    merged: robertc at robertcollins.net-20070405030706-9zpyygdfimm020u8
    parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: misc-fixen
    timestamp: Thu 2007-04-05 13:07:06 +1000
    message:
      Split out the improvement to Transport.local_abspath to raise NotLocalURL from the hpss-faster-copy branch. (Martin Pool, Ian Clatworthy)

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



More information about the bazaar-commits mailing list