Rev 3775: Merge bzr.dev 3789 in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

John Arbash Meinel john at arbash-meinel.com
Wed Oct 22 20:09:20 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3775
revision-id: john at arbash-meinel.com-20081022190707-qf5480pbkqp33d51
parent: john at arbash-meinel.com-20081022190522-dg8twf54j6xhkxwx
parent: pqm at pqm.ubuntu.com-20081021231845-k119hl1icewguq50
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-10-22 14:07:07 -0500
message:
  Merge bzr.dev 3789
added:
  bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
  bzrlib/tests/fake_command.py   fake_command.py-20081021195002-r9v65tgxx63c25v9-1
  doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
  tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
  bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
  bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
  bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
  bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3770.1.19
    revision-id: pqm at pqm.ubuntu.com-20081021231845-k119hl1icewguq50
    parent: pqm at pqm.ubuntu.com-20081021060139-fpwr4fxr2oww2x5o
    parent: aaron at aaronbentley.com-20081021204954-6ly1dyb9ix92el1a
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-10-22 00:18:45 +0100
    message:
      Use Registry for plugin commands, enable lazy command loading.
    added:
      bzrlib/tests/fake_command.py   fake_command.py-20081021195002-r9v65tgxx63c25v9-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
      bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
      bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
        ------------------------------------------------------------
        revno: 3770.13.5
        revision-id: aaron at aaronbentley.com-20081021204954-6ly1dyb9ix92el1a
        parent: aaron at aaronbentley.com-20081021204305-4yf2n78r6b61yo91
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: command-registry
        timestamp: Tue 2008-10-21 21:49:54 +0100
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3770.13.4
        revision-id: aaron at aaronbentley.com-20081021204305-4yf2n78r6b61yo91
        parent: aaron at aaronbentley.com-20081021184910-kvfby9230xv2mbfz
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: command-registry
        timestamp: Tue 2008-10-21 21:43:05 +0100
        message:
          Enable lazy-loading of commands
        added:
          bzrlib/tests/fake_command.py   fake_command.py-20081021195002-r9v65tgxx63c25v9-1
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
        ------------------------------------------------------------
        revno: 3770.13.3
        revision-id: aaron at aaronbentley.com-20081021184910-kvfby9230xv2mbfz
        parent: aaron at aaronbentley.com-20081021184829-wb5obp7gst2207ge
        parent: pqm at pqm.ubuntu.com-20081021060139-fpwr4fxr2oww2x5o
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: command-registry
        timestamp: Tue 2008-10-21 19:49:10 +0100
        message:
          merge with bzr.dev
        added:
          doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
          tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3770.13.2
        revision-id: aaron at aaronbentley.com-20081021184829-wb5obp7gst2207ge
        parent: aaron at aaronbentley.com-20081021140831-a8sqdr5sg8y82z4e
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: command-registry
        timestamp: Tue 2008-10-21 19:48:29 +0100
        message:
          Avoid getting plugins unnecessarily
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
        ------------------------------------------------------------
        revno: 3770.13.1
        revision-id: aaron at aaronbentley.com-20081021140831-a8sqdr5sg8y82z4e
        parent: pqm at pqm.ubuntu.com-20081017223605-ais9run1hp476y1c
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: command-registry
        timestamp: Tue 2008-10-21 15:08:31 +0100
        message:
          Switch from dict to Registry for plugin_cmds
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
    ------------------------------------------------------------
    revno: 3770.1.18
    revision-id: pqm at pqm.ubuntu.com-20081021060139-fpwr4fxr2oww2x5o
    parent: pqm at pqm.ubuntu.com-20081021012629-d2xnxqmr42xrtiy2
    parent: robertc at robertcollins.net-20081021034713-dhjfb9ypmnyr6nga
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-10-21 07:01:39 +0100
    message:
      (robertc) Allow recovery of the text when sha1 checks fail. (Robert
      	Collins)
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
        ------------------------------------------------------------
        revno: 3770.12.2
        revision-id: robertc at robertcollins.net-20081021034713-dhjfb9ypmnyr6nga
        parent: robertc at robertcollins.net-20081021033614-e29ktibkuh7e5zps
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: knits
        timestamp: Tue 2008-10-21 14:47:13 +1100
        message:
          Ensure SHA1KnitCorrupt formats ok.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
        ------------------------------------------------------------
        revno: 3770.12.1
        revision-id: robertc at robertcollins.net-20081021033614-e29ktibkuh7e5zps
        parent: pqm at pqm.ubuntu.com-20081021012629-d2xnxqmr42xrtiy2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: knits
        timestamp: Tue 2008-10-21 14:36:14 +1100
        message:
          Embed the failed text in sha1 knit errors.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3770.1.17
    revision-id: pqm at pqm.ubuntu.com-20081021012629-d2xnxqmr42xrtiy2
    parent: pqm at pqm.ubuntu.com-20081020020359-7f8c4hviijt1m5vq
    parent: mbp at sourcefrog.net-20081021004957-hb823jymj6m2nbpw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-10-21 02:26:29 +0100
    message:
      (mbp) add lp-upload-release script
    added:
      tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3770.11.5
        revision-id: mbp at sourcefrog.net-20081021004957-hb823jymj6m2nbpw
        parent: mbp at sourcefrog.net-20081020235812-itg90mk0u4dez92z
        parent: pqm at pqm.ubuntu.com-20081020020359-7f8c4hviijt1m5vq
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: release-scripts
        timestamp: Tue 2008-10-21 11:49:57 +1100
        message:
          merge trunk
        added:
          doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
          bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3770.11.4
        revision-id: mbp at sourcefrog.net-20081020235812-itg90mk0u4dez92z
        parent: mbp at sourcefrog.net-20081020080933-xba7zw9ffozm6brl
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: release-scripts
        timestamp: Tue 2008-10-21 10:58:12 +1100
        message:
          lp-upload-release now handles names like bzr-1.8.tar.gz
        modified:
          tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
        ------------------------------------------------------------
        revno: 3770.11.3
        revision-id: mbp at sourcefrog.net-20081020080933-xba7zw9ffozm6brl
        parent: mbp at sourcefrog.net-20081020075805-txtgvuxddmnnf0vz
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: release-scripts
        timestamp: Mon 2008-10-20 19:09:33 +1100
        message:
          Build zip file from 'make dist' and document this; also tweak standard announcement mail
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3770.11.2
        revision-id: mbp at sourcefrog.net-20081020075805-txtgvuxddmnnf0vz
        parent: mbp at sourcefrog.net-20081020075705-fervpy1m4xbcjg4y
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: release-scripts
        timestamp: Mon 2008-10-20 18:58:05 +1100
        message:
          Doc lp-upload-release
        modified:
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3770.11.1
        revision-id: mbp at sourcefrog.net-20081020075705-fervpy1m4xbcjg4y
        parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: release-scripts
        timestamp: Mon 2008-10-20 18:57:05 +1100
        message:
          Add a script to upload a download file to Ubuntu
        added:
          tools/packaging/lp-upload-release lpuploadrelease-20081020075647-56zdf9z6yav1bx81-1
    ------------------------------------------------------------
    revno: 3770.1.16
    revision-id: pqm at pqm.ubuntu.com-20081020020359-7f8c4hviijt1m5vq
    parent: pqm at pqm.ubuntu.com-20081017223605-ais9run1hp476y1c
    parent: john at arbash-meinel.com-20081017214424-28m1fwycfvlydpf4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-10-20 03:03:59 +0100
    message:
      (mbp) Updated release process docs
    added:
      doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
    modified:
      doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3770.10.2
        revision-id: john at arbash-meinel.com-20081017214424-28m1fwycfvlydpf4
        parent: mbp at sourcefrog.net-20081017080503-u801jhy4h66dy638
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: release_doc_update
        timestamp: Fri 2008-10-17 16:44:24 -0500
        message:
          Rewrap some doc text, update the diff hunk to be accurate for current NEWS.
        modified:
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3770.10.1
        revision-id: mbp at sourcefrog.net-20081017080503-u801jhy4h66dy638
        parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2008-10-17 19:05:03 +1100
        message:
          Updated release process documentation.
          
          This separates out the things that need to be done *to make the release*
          from things that are done at other times in the cycle or by other people
          
          doc.bazaar-vcs.org is now automatically updated and doesn't need manual
          intervention.
        added:
          doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
        modified:
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 3770.1.15
    revision-id: pqm at pqm.ubuntu.com-20081017223605-ais9run1hp476y1c
    parent: pqm at pqm.ubuntu.com-20081017220336-a1m0npnjf9ojnfbj
    parent: john at arbash-meinel.com-20081017195853-i31d3g7sur1prgvi
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-10-17 23:36:05 +0100
    message:
      (jam) Re-enable the fast-path for annotate,
      	and allow it to work with non-lh compression parents.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3770.9.2
        revision-id: john at arbash-meinel.com-20081017195853-i31d3g7sur1prgvi
        parent: john at arbash-meinel.com-20081017161420-q7au1ngfvf2rwb4j
        parent: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: annotate_cleanups
        timestamp: Fri 2008-10-17 14:58:53 -0500
        message:
          Merge bzr.dev 3783, resolve NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
          bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
          bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3770.9.1
        revision-id: john at arbash-meinel.com-20081017161420-q7au1ngfvf2rwb4j
        parent: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: annotate_cleanups
        timestamp: Fri 2008-10-17 11:14:20 -0500
        message:
          Two fixes for annotate code.
          
          Restore the fast path when a branch is not stacked.
          Handle when compression_parent is not the left-hand parent.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3770.1.14
    revision-id: pqm at pqm.ubuntu.com-20081017220336-a1m0npnjf9ojnfbj
    parent: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
    parent: aaron at aaronbentley.com-20081017142511-jr470g67voko39dd
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-10-17 23:03:36 +0100
    message:
      Include staging in lp-login, remove username from lp: urls (abentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
      bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
      bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
      bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
        ------------------------------------------------------------
        revno: 3770.4.22
        revision-id: aaron at aaronbentley.com-20081017142511-jr470g67voko39dd
        parent: aaron at aaronbentley.com-20081017142120-tuh84cyuh9z6emod
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remove-url-username
        timestamp: Fri 2008-10-17 10:25:11 -0400
        message:
          Add name
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3770.4.21
        revision-id: aaron at aaronbentley.com-20081017142120-tuh84cyuh9z6emod
        parent: aaron at aaronbentley.com-20081017140437-po5jewwstmc1lo6w
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remove-url-username
        timestamp: Fri 2008-10-17 10:21:20 -0400
        message:
          Stop including usernames in resolved lp: urls
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
        ------------------------------------------------------------
        revno: 3770.4.20
        revision-id: aaron at aaronbentley.com-20081017140437-po5jewwstmc1lo6w
        parent: aaron at aaronbentley.com-20081017133742-7ysoh4gx7kxs29lh
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: update-staging
        timestamp: Fri 2008-10-17 10:04:37 -0400
        message:
          Include staging in launchpad-login authentication.
        modified:
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
          bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
        ------------------------------------------------------------
        revno: 3770.4.19
        revision-id: aaron at aaronbentley.com-20081017133742-7ysoh4gx7kxs29lh
        parent: aaron at aaronbentley.com-20081017122234-4lygct4bu1hsube6
        parent: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: update-staging
        timestamp: Fri 2008-10-17 09:37:42 -0400
        message:
          Merge with bzr.dev
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 3770.1.13
    revision-id: pqm at pqm.ubuntu.com-20081017125551-l5zi213vopny82nt
    parent: pqm at pqm.ubuntu.com-20081016213135-0115pw9c95l2dyxq
    parent: aaron at aaronbentley.com-20081017122234-4lygct4bu1hsube6
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-10-17 13:55:51 +0100
    message:
      Implement default ssh usernames via launchpad-login (abentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
      bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
      bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
      bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
      bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
        ------------------------------------------------------------
        revno: 3770.4.18
        revision-id: aaron at aaronbentley.com-20081017122234-4lygct4bu1hsube6
        parent: aaron at aaronbentley.com-20081016184810-ago29htjdh2z0x0t
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Fri 2008-10-17 08:22:34 -0400
        message:
          Fix None handling wrt auth upgrades
        modified:
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
          bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
          bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
        ------------------------------------------------------------
        revno: 3770.4.17
        revision-id: aaron at aaronbentley.com-20081016184810-ago29htjdh2z0x0t
        parent: aaron at aaronbentley.com-20081016184139-ve0w21oeg0by6he6
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 14:48:10 -0400
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3770.4.16
        revision-id: aaron at aaronbentley.com-20081016184139-ve0w21oeg0by6he6
        parent: aaron at aaronbentley.com-20081016183519-llt3cr4n24ymrlrh
        parent: aaron at aaronbentley.com-20081016183758-1c4qosfpmdoee03b
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 14:41:39 -0400
        message:
          Merge with lower thread
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3770.8.3
            revision-id: aaron at aaronbentley.com-20081016183758-1c4qosfpmdoee03b
            parent: aaron at aaronbentley.com-20081016183032-cybgqp6y0ip27mem
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: set_credentials
            timestamp: Thu 2008-10-16 14:37:58 -0400
            message:
              Update NEWS
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3770.4.15
        revision-id: aaron at aaronbentley.com-20081016183519-llt3cr4n24ymrlrh
        parent: aaron at aaronbentley.com-20081016183220-7e692v9fac5613zb
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 14:35:19 -0400
        message:
          Update docs
        modified:
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
        ------------------------------------------------------------
        revno: 3770.4.14
        revision-id: aaron at aaronbentley.com-20081016183220-7e692v9fac5613zb
        parent: aaron at aaronbentley.com-20081016183043-v3d3226g1x7c05ns
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 14:32:20 -0400
        message:
          Adjust for new set_credentials signature
        modified:
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
          bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
        ------------------------------------------------------------
        revno: 3770.4.13
        revision-id: aaron at aaronbentley.com-20081016183043-v3d3226g1x7c05ns
        parent: aaron at aaronbentley.com-20081016160555-6ux64504nzwyxog9
        parent: aaron at aaronbentley.com-20081016183032-cybgqp6y0ip27mem
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 14:30:43 -0400
        message:
          Merge set_credentials into launchpad-login
        modified:
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
            ------------------------------------------------------------
            revno: 3770.8.2
            revision-id: aaron at aaronbentley.com-20081016183032-cybgqp6y0ip27mem
            parent: aaron at aaronbentley.com-20081016182657-1xi0vmda0iffc2g8
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: set_credentials
            timestamp: Thu 2008-10-16 14:30:32 -0400
            message:
              Reverse order of scheme and password
            modified:
              bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
              bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
            ------------------------------------------------------------
            revno: 3770.8.1
            revision-id: aaron at aaronbentley.com-20081016182657-1xi0vmda0iffc2g8
            parent: aaron at aaronbentley.com-20081016160425-z6e33epyqltcn6wj
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: set_credentials
            timestamp: Thu 2008-10-16 14:26:57 -0400
            message:
              Update docs
            modified:
              bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
        ------------------------------------------------------------
        revno: 3770.4.12
        revision-id: aaron at aaronbentley.com-20081016160555-6ux64504nzwyxog9
        parent: aaron at aaronbentley.com-20081016160425-z6e33epyqltcn6wj
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 12:05:55 -0400
        message:
          Enable configuring ssh auth from launchpad-login, with auto-upgrade.
        modified:
          bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
          bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
        ------------------------------------------------------------
        revno: 3770.4.11
        revision-id: aaron at aaronbentley.com-20081016160425-z6e33epyqltcn6wj
        parent: aaron at aaronbentley.com-20081016132940-24l3emoih65h1nsq
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 12:04:25 -0400
        message:
          Ensure changed-name updates clear old values
        modified:
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
        ------------------------------------------------------------
        revno: 3770.4.10
        revision-id: aaron at aaronbentley.com-20081016132940-24l3emoih65h1nsq
        parent: aaron at aaronbentley.com-20081016130333-0cti66q6xo5napqd
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 09:29:40 -0400
        message:
          Ensure credentials are stored
        modified:
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
        ------------------------------------------------------------
        revno: 3770.4.9
        revision-id: aaron at aaronbentley.com-20081016130333-0cti66q6xo5napqd
        parent: aaron at aaronbentley.com-20081015211105-49xq5y8jnla6clni
        parent: aaron at aaronbentley.com-20081016130324-547q140zwnh6g8aq
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Thu 2008-10-16 09:03:33 -0400
        message:
          Merge authconfig into launchpad-login
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
            ------------------------------------------------------------
            revno: 3770.7.1
            revision-id: aaron at aaronbentley.com-20081016130324-547q140zwnh6g8aq
            parent: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
            parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: authconfig
            timestamp: Thu 2008-10-16 09:03:24 -0400
            message:
              Merge with bzr.dev
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3770.4.8
        revision-id: aaron at aaronbentley.com-20081015211105-49xq5y8jnla6clni
        parent: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: launchpad-login
        timestamp: Wed 2008-10-15 17:11:05 -0400
        message:
          Commit work-in-progress
        modified:
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
    ------------------------------------------------------------
    revno: 3770.1.12
    revision-id: pqm at pqm.ubuntu.com-20081016213135-0115pw9c95l2dyxq
    parent: pqm at pqm.ubuntu.com-20081016204321-ayg99pvl7sr7y6qu
    parent: aaron at aaronbentley.com-20081016190501-rvjm4em0kmlilhyf
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-10-16 22:31:35 +0100
    message:
      PreviewTree.iter_changes accepts all standard parameters (abentley)
    modified:
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.19.4
        revision-id: aaron at aaronbentley.com-20081016190501-rvjm4em0kmlilhyf
        parent: aaron at aaronbentley.com-20081014030954-g0ht1o6t40v7ecdp
        parent: aaron at aaronbentley.com-20081016190448-2a4ilw7bqsw08190
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fix-iter-changes
        timestamp: Thu 2008-10-16 15:05:01 -0400
        message:
          Merge direct-patching into fix-iter-changes
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
        ------------------------------------------------------------
        revno: 3363.19.3
        revision-id: aaron at aaronbentley.com-20081014030954-g0ht1o6t40v7ecdp
        parent: aaron at aaronbentley.com-20081014025056-dlyb96nmtv4aenuj
        parent: aaron at aaronbentley.com-20081014030136-8h0rtrxhq8q1d1zu
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fix-iter-changes
        timestamp: Mon 2008-10-13 23:09:54 -0400
        message:
          Merge direct-patching into fix-iter-changes
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
        ------------------------------------------------------------
        revno: 3363.19.2
        revision-id: aaron at aaronbentley.com-20081014025056-dlyb96nmtv4aenuj
        parent: aaron at aaronbentley.com-20081013150916-fq1vm0mvw72jcc3n
        parent: aaron at aaronbentley.com-20081014025051-hd8sbbq3yeqrb49t
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fix-iter-changes
        timestamp: Mon 2008-10-13 22:50:56 -0400
        message:
          Merge direct-patching into fix-iter-changes
        added:
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3363.19.1
        revision-id: aaron at aaronbentley.com-20081013150916-fq1vm0mvw72jcc3n
        parent: aaron at aaronbentley.com-20081010231442-6be32m59zo304a90
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Mon 2008-10-13 11:09:16 -0400
        message:
          Make PreviewTree.iter_changes accept all options.
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3770.1.11
    revision-id: pqm at pqm.ubuntu.com-20081016204321-ayg99pvl7sr7y6qu
    parent: pqm at pqm.ubuntu.com-20081016131807-r3p1hsepd24feegv
    parent: aaron at aaronbentley.com-20081016190448-2a4ilw7bqsw08190
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-10-16 21:43:21 +0100
    message:
      Add iter_patched_from_hunks to reduce API friction (abentley)
    modified:
      bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
      bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
        ------------------------------------------------------------
        revno: 3363.18.4
        revision-id: aaron at aaronbentley.com-20081016190448-2a4ilw7bqsw08190
        parent: aaron at aaronbentley.com-20081014030136-8h0rtrxhq8q1d1zu
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: direct-patching
        timestamp: Thu 2008-10-16 15:04:48 -0400
        message:
          Updates from review (and a doc update)
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
        ------------------------------------------------------------
        revno: 3363.18.3
        revision-id: aaron at aaronbentley.com-20081014030136-8h0rtrxhq8q1d1zu
        parent: aaron at aaronbentley.com-20081014025051-hd8sbbq3yeqrb49t
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: direct-patching
        timestamp: Mon 2008-10-13 23:01:36 -0400
        message:
          Add tests for iter_patched_from_hunks
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
        ------------------------------------------------------------
        revno: 3363.18.2
        revision-id: aaron at aaronbentley.com-20081014025051-hd8sbbq3yeqrb49t
        parent: aaron at aaronbentley.com-20081010231442-6be32m59zo304a90
        parent: aaron at aaronbentley.com-20081014024517-pu1q1kz1v51rvk9f
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: direct-patching
        timestamp: Mon 2008-10-13 22:50:51 -0400
        message:
          Merge merge-into2 into direct-patching
        added:
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3363.18.1
        revision-id: aaron at aaronbentley.com-20081010231442-6be32m59zo304a90
        parent: aaron at aaronbentley.com-20081010225929-08pkzo68wbfr3yqg
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Fri 2008-10-10 19:14:42 -0400
        message:
          Allow patching directly from parsed hunks
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
    ------------------------------------------------------------
    revno: 3770.1.10
    revision-id: pqm at pqm.ubuntu.com-20081016131807-r3p1hsepd24feegv
    parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
    parent: v.ladeuil+lp at free.fr-20081016121145-0a86u6kjd4prz3nn
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-10-16 14:18:07 +0100
    message:
      Trivial doc fix
    modified:
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 3770.6.1
        revision-id: v.ladeuil+lp at free.fr-20081016121145-0a86u6kjd4prz3nn
        parent: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 284343-doc
        timestamp: Thu 2008-10-16 14:11:45 +0200
        message:
          Use '.patch. instead of '.diff'.
          
          * HACKING.txt: 
          Fix the only occurrence of '.diff' in the whole documentation,
          using '.patch' instead as we do in everywhere else.
        modified:
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 3770.1.9
    revision-id: pqm at pqm.ubuntu.com-20081016043554-38i4ho6svnlyba65
    parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
    parent: mbp at sourcefrog.net-20081016035842-77pczqghpnd5rxkt
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-10-16 05:35:54 +0100
    message:
      (mbp) merge 1.8final back to trunk
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3770.5.1
        revision-id: mbp at sourcefrog.net-20081016035842-77pczqghpnd5rxkt
        parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
        parent: pqm at pqm.ubuntu.com-20081016023607-p9j30et9foqm0wa7
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: integration
        timestamp: Thu 2008-10-16 14:58:42 +1100
        message:
          merge 1.8final back to trunk
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3763.3.3
        tags: bzr-1.8
        revision-id: pqm at pqm.ubuntu.com-20081016023607-p9j30et9foqm0wa7
        parent: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
        parent: mbp at sourcefrog.net-20081016015506-kr5oefh484xj90aw
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.8
        timestamp: Thu 2008-10-16 03:36:07 +0100
        message:
          (mbp) prepare 1.8final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
            ------------------------------------------------------------
            revno: 3763.7.2
            revision-id: mbp at sourcefrog.net-20081016015506-kr5oefh484xj90aw
            parent: mbp at sourcefrog.net-20081016015304-6rq775qvvlxtadk4
            committer: Martin Pool <mbp at sourcefrog.net>
            branch nick: prepare-1.8
            timestamp: Thu 2008-10-16 12:55:06 +1100
            message:
              Release bzr 1.8 final
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
            ------------------------------------------------------------
            revno: 3763.7.1
            revision-id: mbp at sourcefrog.net-20081016015304-6rq775qvvlxtadk4
            parent: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
            parent: andrew.bennetts at canonical.com-20081010070446-mqf1sj2g3fy7u6j1
            committer: Martin Pool <mbp at sourcefrog.net>
            branch nick: prepare-1.8
            timestamp: Thu 2008-10-16 12:53:04 +1100
            message:
              Merge Andrew's fix for 230902
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
            ------------------------------------------------------------
            revno: 3763.6.1
            revision-id: andrew.bennetts at canonical.com-20081010070446-mqf1sj2g3fy7u6j1
            parent: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
            parent: andrew.bennetts at canonical.com-20081007115411-uq38cuumnrw0trsm
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: push-unlock-1.8
            timestamp: Fri 2008-10-10 18:04:46 +1100
            message:
              Merge fix for #230902, adding NEWS entry.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
            ------------------------------------------------------------
            revno: 3758.1.1
            revision-id: andrew.bennetts at canonical.com-20081007115411-uq38cuumnrw0trsm
            parent: pqm at pqm.ubuntu.com-20081001235145-nh3r3qcg0nwwmvdg
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: push-unlock
            timestamp: Tue 2008-10-07 22:54:11 +1100
            message:
              Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
            modified:
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
        ------------------------------------------------------------
        revno: 3763.3.2
        revision-id: pqm at pqm.ubuntu.com-20081009001122-ftxm8443zmis8vm4
        parent: pqm at pqm.ubuntu.com-20081007091257-ec2725q2xsrji7dn
        parent: mbp at sourcefrog.net-20081008225502-ekthueaqnz3cutg3
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.8
        timestamp: Thu 2008-10-09 01:11:22 +0100
        message:
          (mbp) define -DWIN32 for pyrex
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3763.5.4
        revision-id: mbp at sourcefrog.net-20081008225502-ekthueaqnz3cutg3
        parent: mbp at sourcefrog.net-20081008053353-aqjccu3zsifjz0f1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 277481-win32-pyrex
        timestamp: Thu 2008-10-09 09:55:02 +1100
        message:
          News for 277481
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3763.5.3
        revision-id: mbp at sourcefrog.net-20081008053353-aqjccu3zsifjz0f1
        parent: mbp at sourcefrog.net-20081008011605-tzgv9owfn2wde4cg
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 277481-win32-pyrex
        timestamp: Wed 2008-10-08 16:33:53 +1100
        message:
          Review feedback on add_pyrex_extension
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3763.5.2
        revision-id: mbp at sourcefrog.net-20081008011605-tzgv9owfn2wde4cg
        parent: mbp at sourcefrog.net-20081008011111-z68x2eto2j52648n
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.8
        timestamp: Wed 2008-10-08 12:16:05 +1100
        message:
          Set -DWIN32 for all pyrex extensions, not one by one
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3763.5.1
        revision-id: mbp at sourcefrog.net-20081008011111-z68x2eto2j52648n
        parent: pqm at pqm.ubuntu.com-20081007091257-ec2725q2xsrji7dn
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.8
        timestamp: Wed 2008-10-08 12:11:11 +1100
        message:
          WIN32 must be defined when building all Pyrex extensions on Windows (#277481, from bialix)
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3770.1.8
    revision-id: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
    parent: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
    parent: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-10-15 22:44:44 +0100
    message:
      Enable specifying default ssh username in authentication.conf
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
      bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
      bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
        ------------------------------------------------------------
        revno: 3770.4.7
        revision-id: aaron at aaronbentley.com-20081015191156-mrykcuir96zszuh7
        parent: aaron at aaronbentley.com-20081015190711-so8c7mo9rfzs479e
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 15:11:56 -0400
        message:
          Restore AuthenticationConfig
        modified:
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
        ------------------------------------------------------------
        revno: 3770.4.6
        revision-id: aaron at aaronbentley.com-20081015190711-so8c7mo9rfzs479e
        parent: aaron at aaronbentley.com-20081015185954-6hm2y83u6fddrkeg
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 15:07:11 -0400
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3770.4.5
        revision-id: aaron at aaronbentley.com-20081015185954-6hm2y83u6fddrkeg
        parent: aaron at aaronbentley.com-20081015185907-lw5srt2ah0huccvt
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 14:59:54 -0400
        message:
          Remove AuthenticationConfig handling from Paramiko SSHVendor
        modified:
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
        ------------------------------------------------------------
        revno: 3770.4.4
        revision-id: aaron at aaronbentley.com-20081015185907-lw5srt2ah0huccvt
        parent: aaron at aaronbentley.com-20081015184528-mcdgasht0vz5bo8k
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 14:59:07 -0400
        message:
          bzr+ssh and sftp both use ssh scheme.
        modified:
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
        ------------------------------------------------------------
        revno: 3770.4.3
        revision-id: aaron at aaronbentley.com-20081015184528-mcdgasht0vz5bo8k
        parent: aaron at aaronbentley.com-20081015172318-kg6h9v0daz8m66ns
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 14:45:28 -0400
        message:
          Use SSH default username from authentication.conf
        modified:
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
        ------------------------------------------------------------
        revno: 3770.4.2
        revision-id: aaron at aaronbentley.com-20081015172318-kg6h9v0daz8m66ns
        parent: aaron at aaronbentley.com-20081015155150-ewayhro15dhve4cs
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 13:23:18 -0400
        message:
          Make testing more thorough
        modified:
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 3770.4.1
        revision-id: aaron at aaronbentley.com-20081015155150-ewayhro15dhve4cs
        parent: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ssh-authconfig
        timestamp: Wed 2008-10-15 11:51:50 -0400
        message:
          Use auth.conf for sftp
        modified:
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    revno: 3770.1.7
    revision-id: pqm at pqm.ubuntu.com-20081014031836-0pn8u98igc7gvtv0
    parent: pqm at pqm.ubuntu.com-20081013060130-008463ut01xr4rx2
    parent: aaron at aaronbentley.com-20081014024517-pu1q1kz1v51rvk9f
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-10-14 04:18:36 +0100
    message:
      Allow merging into PreviewTrees
    modified:
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.29
        revision-id: aaron at aaronbentley.com-20081014024517-pu1q1kz1v51rvk9f
        parent: aaron at aaronbentley.com-20081014024442-i1kwl151g3ybu724
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Mon 2008-10-13 22:45:17 -0400
        message:
          Remove obsolete NEWS entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3363.17.28
        revision-id: aaron at aaronbentley.com-20081014024442-i1kwl151g3ybu724
        parent: aaron at aaronbentley.com-20081014023456-fczp9t705gxk3856
        parent: pqm at pqm.ubuntu.com-20081013060130-008463ut01xr4rx2
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Mon 2008-10-13 22:44:42 -0400
        message:
          Merge bzr.dev
        added:
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3363.17.27
        revision-id: aaron at aaronbentley.com-20081014023456-fczp9t705gxk3856
        parent: aaron at aaronbentley.com-20081010225929-08pkzo68wbfr3yqg
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Mon 2008-10-13 22:34:56 -0400
        message:
          Add default case for create_from_tree
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.26
        revision-id: aaron at aaronbentley.com-20081010225929-08pkzo68wbfr3yqg
        parent: aaron at aaronbentley.com-20081010115503-6aolshz5fz0s2ai4
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Fri 2008-10-10 18:59:29 -0400
        message:
          Deprecate create_by_entry
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.25
        revision-id: aaron at aaronbentley.com-20081010115503-6aolshz5fz0s2ai4
        parent: aaron at aaronbentley.com-20081010052720-izbsk3d87f5rv6eq
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Fri 2008-10-10 07:55:03 -0400
        message:
          remove get_inventory_entry, replace with create_from_tree
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3363.17.24
        revision-id: aaron at aaronbentley.com-20081010052720-izbsk3d87f5rv6eq
        parent: aaron at aaronbentley.com-20081009025721-ibrbd8v2p48ycgeg
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Fri 2008-10-10 01:27:20 -0400
        message:
          Implement create_by_tree
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.23
        revision-id: aaron at aaronbentley.com-20081009025721-ibrbd8v2p48ycgeg
        parent: aaron at aaronbentley.com-20081008024214-sfcpqtc252v6enah
        parent: pqm at pqm.ubuntu.com-20081008020104-e68hyxx45qo19nzx
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Wed 2008-10-08 22:57:21 -0400
        message:
          Merge with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/api.py                  api.py-20070626082640-35lspz7j0ys7a8ld-1
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/test_api.py       testapi.py-20051027033546-6f9be2d308d18a52
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3363.17.22
        revision-id: aaron at aaronbentley.com-20081008024214-sfcpqtc252v6enah
        parent: aaron at aaronbentley.com-20081007210107-pdm9xz7ae1ouzv39
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 22:42:14 -0400
        message:
          Cache expensive operations
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.21
        revision-id: aaron at aaronbentley.com-20081007210107-pdm9xz7ae1ouzv39
        parent: aaron at aaronbentley.com-20081007202840-dd9hmkmysht6onv3
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 17:01:07 -0400
        message:
          Conflicts are handled when merging from preview trees
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
        ------------------------------------------------------------
        revno: 3363.17.20
        revision-id: aaron at aaronbentley.com-20081007202840-dd9hmkmysht6onv3
        parent: aaron at aaronbentley.com-20081007202625-ftgbfta1rlmladcq
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 16:28:40 -0400
        message:
          Fix merging from PreviewTree
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 3363.17.19
        revision-id: aaron at aaronbentley.com-20081007202625-ftgbfta1rlmladcq
        parent: aaron at aaronbentley.com-20081007195431-9ney90m41jciyi03
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 16:26:25 -0400
        message:
          Implement get_inventory_entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3363.17.18
        revision-id: aaron at aaronbentley.com-20081007195431-9ney90m41jciyi03
        parent: aaron at aaronbentley.com-20081007190743-w0n16qt57ahg61cw
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 15:54:31 -0400
        message:
          Fix is_executable for PreviewTree
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.17
        revision-id: aaron at aaronbentley.com-20081007190743-w0n16qt57ahg61cw
        parent: aaron at aaronbentley.com-20081007183754-dmv7o3wb34jao306
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 15:07:43 -0400
        message:
          Start testing merging PreviewTree as OTHER
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3363.17.16
        revision-id: aaron at aaronbentley.com-20081007183754-dmv7o3wb34jao306
        parent: aaron at aaronbentley.com-20080929184621-reu2x9oi16wrahfs
        parent: pqm at pqm.ubuntu.com-20081007110356-zmp1x6pyx5lnlh5k
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into2
        timestamp: Tue 2008-10-07 14:37:54 -0400
        message:
          Merge with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
          bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-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/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3363.17.15
        revision-id: aaron at aaronbentley.com-20080929184621-reu2x9oi16wrahfs
        parent: aaron at aaronbentley.com-20080929184305-1ayhg56t6k943qd6
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: merge-into
        timestamp: Mon 2008-09-29 14:46:21 -0400
        message:
          Update docs
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
    ------------------------------------------------------------
    revno: 3770.1.6
    revision-id: pqm at pqm.ubuntu.com-20081013060130-008463ut01xr4rx2
    parent: pqm at pqm.ubuntu.com-20081012204951-j2dgh06nuzrak1ri
    parent: mbp at sourcefrog.net-20081013052132-cod2rnpx2irj3pdk
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-10-13 07:01:30 +0100
    message:
      (mbp) Add NEWS headers for 1.8
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3770.3.1
        revision-id: mbp at sourcefrog.net-20081013052132-cod2rnpx2irj3pdk
        parent: pqm at pqm.ubuntu.com-20081012204951-j2dgh06nuzrak1ri
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Mon 2008-10-13 16:21:32 +1100
        message:
          Add news headers for 1.8
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3770.1.5
    revision-id: pqm at pqm.ubuntu.com-20081012204951-j2dgh06nuzrak1ri
    parent: pqm at pqm.ubuntu.com-20081010205404-cdqffky0apwxkk1d
    parent: aaron at aaronbentley.com-20081012161453-8ucuh04czfirbln0
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-10-12 21:49:51 +0100
    message:
      Deprecate find_renames (abentley)
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 1551.21.3
        revision-id: aaron at aaronbentley.com-20081012161453-8ucuh04czfirbln0
        parent: aaron at aaronbentley.com-20081012161117-et0n1u2221zzwc8z
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2008-10-12 12:14:53 -0400
        message:
          Update deprecation for new version
        modified:
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 1551.21.2
        revision-id: aaron at aaronbentley.com-20081012161117-et0n1u2221zzwc8z
        parent: aaron at aaronbentley.com-20080921002734-kftpcgbh8yc3zjnc
        parent: pqm at pqm.ubuntu.com-20081010205404-cdqffky0apwxkk1d
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Sun 2008-10-12 12:11:17 -0400
        message:
          Merge with trunk
        removed:
          bzrlib/_walkdirs_win32.h       _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
        added:
          bzrlib/python-compat.h         pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
          bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py test_get_file_with_s-20080922035909-lhdovrr36jpxmu0v-1
          doc/developers/lca_tree_merging.txt lca_merge_resolution-20080731173903-8ku77uz7o6smd3jj-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
          bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
          bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
          bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
          bzrlib/_readdir_py.py          readdir.py-20060609152855-rm6v321vuaqyh9tu-3
          bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
          bzrlib/_walkdirs_win32.pyx     _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/api.py                  api.py-20070626082640-35lspz7j0ys7a8ld-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/lsprof.py               lsprof.py-20051208071030-833790916798ceed
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-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/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
          bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
          bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
          bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
          bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
          bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
          bzrlib/tests/test_api.py       testapi.py-20051027033546-6f9be2d308d18a52
          bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
          doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 1551.21.1
        revision-id: aaron at aaronbentley.com-20080921002734-kftpcgbh8yc3zjnc
        parent: aaron at aaronbentley.com-20080920203502-mdw6o6gtbalyo2bb
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Sat 2008-09-20 20:27:34 -0400
        message:
          Deprecate tree.find_renames
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3770.1.4
    revision-id: pqm at pqm.ubuntu.com-20081010205404-cdqffky0apwxkk1d
    parent: pqm at pqm.ubuntu.com-20081010201349-ccw3kwu9fe7iaw77
    parent: john at arbash-meinel.com-20081003161439-h23zdckp4z78wh3r
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-10-10 21:54:04 +0100
    message:
      (jam) Bug #269456, when extracting file texts,
      	don't extract the whole WT at once.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3763.4.1
        revision-id: john at arbash-meinel.com-20081003161439-h23zdckp4z78wh3r
        parent: pqm at pqm.ubuntu.com-20081002172844-d6df1l8dzpsqzyup
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: lighter_iter_files_bytes
        timestamp: Fri 2008-10-03 11:14:39 -0500
        message:
          Possible fix for bug #269456.
          
          During 'get_record_stream()' only unpack one file's content map
          at a time. This helps prevent abusive consumption of memory.
          Also, free the lines cache as texts are consumed.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3770.1.3
    revision-id: pqm at pqm.ubuntu.com-20081010201349-ccw3kwu9fe7iaw77
    parent: pqm at pqm.ubuntu.com-20081010194144-0hujuzlipigm8pbs
    parent: john at arbash-meinel.com-20081010191519-jrqt2sf7jw4u392o
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-10-10 21:13:49 +0100
    message:
      (jam) Add a hidden 'dump-btree' command for getting the raw info out
      	of a btree index.
    added:
      bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
        ------------------------------------------------------------
        revno: 3770.2.5
        revision-id: john at arbash-meinel.com-20081010191519-jrqt2sf7jw4u392o
        parent: john at arbash-meinel.com-20081010185341-bbrdlq1ydy2ovnv7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dump_btree
        timestamp: Fri 2008-10-10 14:15:19 -0500
        message:
          Add a trailing period for the option '--raw'
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3770.2.4
        revision-id: john at arbash-meinel.com-20081010185341-bbrdlq1ydy2ovnv7
        parent: john at arbash-meinel.com-20081008215612-y9v94tqxreqoangx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dump_btree
        timestamp: Fri 2008-10-10 13:53:41 -0500
        message:
          Clarify the help text a bit.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3770.2.3
        revision-id: john at arbash-meinel.com-20081008215612-y9v94tqxreqoangx
        parent: john at arbash-meinel.com-20081008215137-wu18nhhorncyon50
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dump_btree
        timestamp: Wed 2008-10-08 16:56:12 -0500
        message:
          Simplify the --raw mode.
          
          I didn't realize, but the only node that is special cased is the 'root' node,
          and to read it, you actually have to parse it directly, because the
          compressed bytes start immediately after the end of the header, rather than
          having any padding before the zlib bytes.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
        ------------------------------------------------------------
        revno: 3770.2.2
        revision-id: john at arbash-meinel.com-20081008215137-wu18nhhorncyon50
        parent: john at arbash-meinel.com-20081008204023-z1u32sjby509wl12
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dump_btree
        timestamp: Wed 2008-10-08 16:51:37 -0500
        message:
          Add a --raw output for dump-btree.
          
          This does the minimum it can, so that we can dump out the
          raw bytes in a meaningful manner.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
        ------------------------------------------------------------
        revno: 3770.2.1
        revision-id: john at arbash-meinel.com-20081008204023-z1u32sjby509wl12
        parent: pqm at pqm.ubuntu.com-20081008020104-e68hyxx45qo19nzx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dump_btree
        timestamp: Wed 2008-10-08 15:40:23 -0500
        message:
          First draft of a basic dump-btree command.
          
          Does enough for what I need with pack-names files, but I'd like it to be a
          bit more 'raw'.
        added:
          bzrlib/tests/blackbox/test_dump_btree.py test_dump_btree.py-20081008203335-zkpcq230b6vubszz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
    ------------------------------------------------------------
    revno: 3770.1.2
    revision-id: pqm at pqm.ubuntu.com-20081010194144-0hujuzlipigm8pbs
    parent: pqm at pqm.ubuntu.com-20081009222709-e64jq9sfyzvqjbn2
    parent: john at arbash-meinel.com-20081002163505-sscy52tfqzz7ltg9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-10-10 20:41:44 +0100
    message:
      (jam) Change the setup.py build process to fail unless
      	--allow-python-fallback is supplied.
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3759.1.1
        revision-id: john at arbash-meinel.com-20081002163505-sscy52tfqzz7ltg9
        parent: pqm at pqm.ubuntu.com-20081002065404-0sjc6vwukw26m5wo
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: setup_fail
        timestamp: Thu 2008-10-02 11:35:05 -0500
        message:
          Default to requiring extensions.
          
          The build process will fail if extensions cannot be compiled, unless
          --allow-python-fallback is supplied.
          This helps PQM to make sure extensions are tested, and helps
          users by having them explicitly allow non-compiled forms.
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3770.1.1
    revision-id: pqm at pqm.ubuntu.com-20081009222709-e64jq9sfyzvqjbn2
    parent: pqm at pqm.ubuntu.com-20081008020104-e68hyxx45qo19nzx
    parent: mbp at sourcefrog.net-20081009214813-6440j5zyl4lmxhfb
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-10-09 23:27:09 +0100
    message:
      (mbp) updated ppa documentation
    modified:
      doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
    ------------------------------------------------------------
    revno: 3749.2.2
    revision-id: mbp at sourcefrog.net-20081009214813-6440j5zyl4lmxhfb
    parent: mbp at sourcefrog.net-20081009091718-1b4ejhseb5bq4gt4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Fri 2008-10-10 08:48:13 +1100
    message:
      typo
    modified:
      doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
    ------------------------------------------------------------
    revno: 3749.2.1
    revision-id: mbp at sourcefrog.net-20081009091718-1b4ejhseb5bq4gt4
    parent: pqm at pqm.ubuntu.com-20080927233809-mlgk5zkwowkb8q8z
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Thu 2008-10-09 20:17:18 +1100
    message:
      Updated PPA documentation
    modified:
      doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
-------------- next part --------------

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


More information about the bazaar-commits mailing list