Rev 3964: Merge bzr.dev 3983, resolve conflicts in NEWS in lp:///~jameinel/bzr/win32-shelve

John Arbash Meinel john at arbash-meinel.com
Thu Feb 5 21:07:21 GMT 2009


At lp:///~jameinel/bzr/win32-shelve

------------------------------------------------------------
revno: 3964
revision-id: john at arbash-meinel.com-20090205210649-krqkwm2un4ey5upc
parent: john at arbash-meinel.com-20090126213740-uy7eg1o2cjxze5b3
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32-shelve
timestamp: Thu 2009-02-05 15:06:49 -0600
message:
  Merge bzr.dev 3983, resolve conflicts in NEWS
added:
  bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
  bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
  bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
  bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
  bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
  bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
  bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
  bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
  doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
    ------------------------------------------------------------
    revno: 3955.1.28
    revision-id: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
    parent: pqm at pqm.ubuntu.com-20090205054228-3qyiv92vtgs94e0c
    parent: v.ladeuil+lp at free.fr-20090205102051-gyivrlud1hk1c12g
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-02-05 11:00:39 +0000
    message:
      (vila) Progress bar at socket level for http
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
      bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3955.24.1
        revision-id: v.ladeuil+lp at free.fr-20090205102051-gyivrlud1hk1c12g
        parent: pqm at pqm.ubuntu.com-20090205054228-3qyiv92vtgs94e0c
        parent: v.ladeuil+lp at free.fr-20090130004941-820fpd2ryyo127vv
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr.integration
        timestamp: Thu 2009-02-05 11:20:51 +0100
        message:
          Progress bar at socket level for http
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3945.1.8
        revision-id: v.ladeuil+lp at free.fr-20090130004941-820fpd2ryyo127vv
        parent: v.ladeuil+lp at free.fr-20090129193101-w0008aa1ufoe7cmd
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: pb-http
        timestamp: Fri 2009-01-30 01:49:41 +0100
        message:
          Add more tests, fix pycurl double handling, revert previous tracking.
          
          * bzrlib/tests/test_http.py:
          (PredefinedRequestHandler): Renamed from
          PreRecordedRequestHandler.
          (PredefinedRequestHandler.handle_one_request): Get the canned
          response from the test server directly.
          (ActivityServerMixin): Make it a true object and intialize the
          attributes in the constructor. Tests can now set the
          canned_response attribute before querying the server.
          (TestActivity.setUp, TestActivity.tearDown,
          TestActivity.get_transport, TestActivity.assertActivitiesMatch):
          Extracted from test_get to be able to write other tests.
          (TestActivity.test_has, TestActivity.test_readv,
          TestActivity.test_post): New tests, all cases should be covered
          now.
          
          * bzrlib/transport/http/response.py:
          (RangeFile.__init__, RangeFile.read, handle_response): Revert
          previous tracking, both http implementations can now report
          activity from the socket.
          
          * bzrlib/transport/http/_pycurl.py:
          (PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
          previous tracking.
        modified:
          BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3945.1.7
        revision-id: v.ladeuil+lp at free.fr-20090129193101-w0008aa1ufoe7cmd
        parent: v.ladeuil+lp at free.fr-20090129165458-o52vbf2nl4dxadoc
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: pb-http
        timestamp: Thu 2009-01-29 20:31:01 +0100
        message:
          Test against https.
          
          * bzrlib/tests/test_http.py:
          (load_tests): Get rid of TestAdapter daughter classes, they are
          useless. Add parametrization against http/https for activity
          tests.
          (ActivityServerMixin, ActivityHTTPServer, ActivityHTTPSServer):
          Make HTTP[S] servers.
          (PreRecordedRequestHandler.handle_one_request): Be defensive
          against threads being non-deterministic.
          (TestActivity.test_http_get): Use parametrized test server.
          
          * bzrlib/tests/https_server.py:
          (HTTPSServer.__init__): Add protocol_version parameter for tests
          purposes.
        modified:
          BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
          bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
        ------------------------------------------------------------
        revno: 3945.1.6
        revision-id: v.ladeuil+lp at free.fr-20090129165458-o52vbf2nl4dxadoc
        parent: v.ladeuil+lp at free.fr-20090129142728-1iu8017zgso23w0i
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: pb-http
        timestamp: Thu 2009-01-29 17:54:58 +0100
        message:
          Fix debug handling for pycurl and implement pycurl http activity
          reporting at socket level.
          
          * bzrlib/transport/http/_pycurl.py:
          (PyCurlTransport._debug_cb): Two birds with one stone: correctly
          handle the debug traces with mutter (no more stderr pollution !)
          and report activity for all the transmitted headers and data in
          both directions.
          (PyCurlTransport._set_curl_options): Setup a pycurl debug callback
          for both activity reporting and http debug flag handling.
        modified:
          BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
        ------------------------------------------------------------
        revno: 3945.1.5
        revision-id: v.ladeuil+lp at free.fr-20090129142728-1iu8017zgso23w0i
        parent: v.ladeuil+lp at free.fr-20090126081302-ad8l8nhn2sscymxt
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: pb-http
        timestamp: Thu 2009-01-29 15:27:28 +0100
        message:
          Start implementing http activity reporting at socket level.
          
          * bzrlib/transport/http/_urllib2_wrappers.py:
          (_ReportingFileSocket, _ReportingSocket): Wrappers for
          socket._socket and socket_filesocket objects providing activity
          reporting.
          (Response.__init__): Deleted. Wrapping the file socket object is
          now done handled at connection time.
          (AbstractHTTPConnection._wrap_socket_for_reporting): Wrap the
          underlying socket into a reporting one.
          (HTTPConnection.__init__, HTTPSConnection.__init__): Accept a
          report_activity parameter.
          (HTTPSConnection.connect): Wrap the newly created socket.
          (HTTPSConnection.connect_to_origin): Wrap the newly created *or*
          connected ssl socket.
          (ConnectionHandler.__init__): Accept a report_activity parameter.
          (ConnectionHandler.create_connection): Pass the report_activity
          parameter to all created connections.
          (Opener.__init__): Accept a report_activity parameter.
          
          * bzrlib/transport/http/_urllib.py:
          (HttpTransport_urllib.__init__): Provide the report activity
          function to the opener.
          (HttpTransport_urllib._get, HttpTransport_urllib._post): Don't use
          the RangeFile report activity facility anymore.
          
          * bzrlib/transport/http/__init__.py:
          (HttpTransportBase.get_bytes): Deleted, this gratuitously add a
          useless level of buffering.
          
          * bzrlib/tests/test_http.py:
          (ActivityHttpServer, PreRecoredRequestHandler, TestActivity): Test
          activity reporting by http clients.
        modified:
          BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
        ------------------------------------------------------------
        revno: 3945.1.4
        revision-id: v.ladeuil+lp at free.fr-20090126081302-ad8l8nhn2sscymxt
        parent: v.ladeuil+lp at free.fr-20090122112003-pcp5bu8pfc41u7iz
        parent: v.ladeuil+lp at free.fr-20090126081250-m310ky1gjotwcw37
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: pb-http
        timestamp: Mon 2009-01-26 09:13:02 +0100
        message:
          Merge emacs-ui-fixes into pb-http
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_rules.py     test_properties.py-20080506033501-3p9kmuob25dho8xl-1
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
        ------------------------------------------------------------
        revno: 3945.2.1
        revision-id: v.ladeuil+lp at free.fr-20090126081250-m310ky1gjotwcw37
        parent: v.ladeuil+lp at free.fr-20090119130947-1ldks301mpsymf8r
        parent: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: emacs-ui-fixes
        timestamp: Mon 2009-01-26 09:12:50 +0100
        message:
          Merge bzr.dev into emacs-ui-fixes
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_rules.py     test_properties.py-20080506033501-3p9kmuob25dho8xl-1
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3955.1.27
    revision-id: pqm at pqm.ubuntu.com-20090205054228-3qyiv92vtgs94e0c
    parent: pqm at pqm.ubuntu.com-20090204125611-m7kqmwruvndk7yrv
    parent: mbp at sourcefrog.net-20090127172741-kg1zwh7roiokob7r
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-02-05 05:42:28 +0000
    message:
      (mbp) better and less redundant debug flag docs
    modified:
      bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 3955.23.5
        revision-id: mbp at sourcefrog.net-20090127172741-kg1zwh7roiokob7r
        parent: mbp at sourcefrog.net-20090127171557-wblksjk0fhwecq8v
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: debug-sftp
        timestamp: Tue 2009-01-27 15:27:41 -0200
        message:
          pep8 correctness (maybe) for global variables
        modified:
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
        ------------------------------------------------------------
        revno: 3955.23.4
        revision-id: mbp at sourcefrog.net-20090127171557-wblksjk0fhwecq8v
        parent: mbp at sourcefrog.net-20090126180413-n0ue2d54zgiqe7jy
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: debug-sftp
        timestamp: Tue 2009-01-27 15:15:57 -0200
        message:
          test_resource_string shouldn't depend on the precise source file contents
        modified:
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 3955.23.3
        revision-id: mbp at sourcefrog.net-20090126180413-n0ue2d54zgiqe7jy
        parent: mbp at sourcefrog.net-20090126180113-24hunvris7gp1gb8
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: debug-sftp
        timestamp: Mon 2009-01-26 16:04:13 -0200
        message:
          Guard common sftp mutter statements by debug flags
        modified:
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
        ------------------------------------------------------------
        revno: 3955.23.2
        revision-id: mbp at sourcefrog.net-20090126180113-24hunvris7gp1gb8
        parent: mbp at sourcefrog.net-20090126175753-cxw1l1o09bffd4kr
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: debug-sftp
        timestamp: Mon 2009-01-26 16:01:13 -0200
        message:
          Brief developer docs about debug flags
        modified:
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 3955.23.1
        revision-id: mbp at sourcefrog.net-20090126175753-cxw1l1o09bffd4kr
        parent: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: debug-sftp
        timestamp: Mon 2009-01-26 15:57:53 -0200
        message:
          Remove redundant description of debug flags from debug.py
        modified:
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 3955.1.26
    revision-id: pqm at pqm.ubuntu.com-20090204125611-m7kqmwruvndk7yrv
    parent: pqm at pqm.ubuntu.com-20090204045809-piqek6zlyl0x5ncw
    parent: andrew.bennetts at canonical.com-20090204120526-ftwn676dnbmremw8
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2009-02-04 12:56:11 +0000
    message:
      Add client and server APIs for streamed request bodies.
    modified:
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
        ------------------------------------------------------------
        revno: 3842.3.22
        revision-id: andrew.bennetts at canonical.com-20090204120526-ftwn676dnbmremw8
        parent: andrew.bennetts at canonical.com-20090202055634-2uktwnsmer5s7g6q
        parent: pqm at pqm.ubuntu.com-20090204045809-piqek6zlyl0x5ncw
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: call_with_body_stream
        timestamp: Wed 2009-02-04 23:05:26 +1100
        message:
          Merge bzr.dev
        modified:
          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/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 3842.3.21
        revision-id: andrew.bennetts at canonical.com-20090202055634-2uktwnsmer5s7g6q
        parent: andrew.bennetts at canonical.com-20090127074855-4z3yi34s583vrd1v
        parent: pqm at pqm.ubuntu.com-20090130031028-y70uzzpad9c47v09
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: call_with_body_stream
        timestamp: Mon 2009-02-02 16:56:34 +1100
        message:
          Merge bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
          bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3842.3.20
        revision-id: andrew.bennetts at canonical.com-20090127074855-4z3yi34s583vrd1v
        parent: andrew.bennetts at canonical.com-20090127070825-4yicgkrd91k93fox
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: call_with_body_stream
        timestamp: Tue 2009-01-27 18:48:55 +1100
        message:
          Re-revert changes from another thread that accidentally got reinstated here.
        removed:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3842.3.19
        revision-id: andrew.bennetts at canonical.com-20090127070825-4yicgkrd91k93fox
        parent: andrew.bennetts at canonical.com-20090127050443-3yw5hhk10ss23hzu
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: call_with_body_stream
        timestamp: Tue 2009-01-27 18:08:25 +1100
        message:
          Tweaks suggested by review.
        modified:
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
        ------------------------------------------------------------
        revno: 3842.3.18
        revision-id: andrew.bennetts at canonical.com-20090127050443-3yw5hhk10ss23hzu
        parent: andrew.bennetts at canonical.com-20090113062447-v1dnaf4e8x8mk8r8
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: call_with_body_stream
        timestamp: Tue 2009-01-27 16:04:43 +1100
        message:
          Merge bzr.dev.
        added:
          bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
          bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
          bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
          bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
          bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
          bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
          bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
          bzrlib/tests/ssl_certs/        ssl_certs-20071124141654-dc9za9nho2gmzbri-1
          bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
          bzrlib/tests/ssl_certs/ca.crt  ca.crt-20071124141703-j5hr254lm287lyut-7
          bzrlib/tests/ssl_certs/ca.key  ca.key-20071124141703-j5hr254lm287lyut-6
          bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
          bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
          bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
          bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
          bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
          doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
          doc/news-template.txt          newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_rules.py     test_properties.py-20080506033501-3p9kmuob25dho8xl-1
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3842.3.17
        revision-id: andrew.bennetts at canonical.com-20090113062447-v1dnaf4e8x8mk8r8
        parent: andrew.bennetts at canonical.com-20090112061723-y4s1s29mf2fq1ops
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Tue 2009-01-13 17:24:47 +1100
        message:
          Add comment.
        modified:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        ------------------------------------------------------------
        revno: 3842.3.16
        revision-id: andrew.bennetts at canonical.com-20090112061723-y4s1s29mf2fq1ops
        parent: andrew.bennetts at canonical.com-20090106233811-3lzvth3szdhh9wej
        parent: andrew.bennetts at canonical.com-20090112040039-1au92x5eqvt8p9t9
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Mon 2009-01-12 17:17:23 +1100
        message:
          Merge updated call_with_body_bytes.
        modified:
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
            ------------------------------------------------------------
            revno: 3923.5.6
            revision-id: andrew.bennetts at canonical.com-20090112040039-1au92x5eqvt8p9t9
            parent: andrew.bennetts at canonical.com-20090112022402-07r27yabykqp3rdw
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: call_with_body_stream
            timestamp: Mon 2009-01-12 15:00:39 +1100
            message:
              Fix a style nit.
            modified:
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
            ------------------------------------------------------------
            revno: 3923.5.5
            revision-id: andrew.bennetts at canonical.com-20090112022402-07r27yabykqp3rdw
            parent: andrew.bennetts at canonical.com-20090112021051-68imnanpiw25x0vk
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: call_with_body_stream
            timestamp: Mon 2009-01-12 13:24:02 +1100
            message:
              Cleanly abort the request if an error occurs while iterating a body stream.
            modified:
              bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
            ------------------------------------------------------------
            revno: 3923.5.4
            revision-id: andrew.bennetts at canonical.com-20090112021051-68imnanpiw25x0vk
            parent: andrew.bennetts at canonical.com-20090109062245-jw5jbc723zefd8ru
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: call_with_body_stream
            timestamp: Mon 2009-01-12 13:10:51 +1100
            message:
              Allow a request's body part(s) to be followed by an error.
            modified:
              bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
              bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
            ------------------------------------------------------------
            revno: 3923.5.3
            revision-id: andrew.bennetts at canonical.com-20090109062245-jw5jbc723zefd8ru
            parent: andrew.bennetts at canonical.com-20090109061134-ulc6y3mpz1djqigh
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: call_with_body_stream
            timestamp: Fri 2009-01-09 17:22:45 +1100
            message:
              Raise a better exception if a premature message end happens.
            modified:
              bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
            ------------------------------------------------------------
            revno: 3923.5.2
            revision-id: andrew.bennetts at canonical.com-20090109061134-ulc6y3mpz1djqigh
            parent: andrew.bennetts at canonical.com-20090109055237-t3oandez65vs06uk
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: call_with_body_stream
            timestamp: Fri 2009-01-09 17:11:34 +1100
            message:
              Completely delegate handling of request body chunks to the command object.  The default implementation accumulates, like the existing behaviour.
            modified:
              bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
              bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
            ------------------------------------------------------------
            revno: 3923.5.1
            revision-id: andrew.bennetts at canonical.com-20090109055237-t3oandez65vs06uk
            parent: pqm at pqm.ubuntu.com-20090106171520-9pzjoqa7m74hvhht
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: call_with_body_stream
            timestamp: Fri 2009-01-09 16:52:37 +1100
            message:
              Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
            modified:
              bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
              bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
              bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
              bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
              bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
        ------------------------------------------------------------
        revno: 3842.3.15
        revision-id: andrew.bennetts at canonical.com-20090106233811-3lzvth3szdhh9wej
        parent: andrew.bennetts at canonical.com-20081212075837-5rmjp846gxxd1tvr
        parent: pqm at pqm.ubuntu.com-20090106171520-9pzjoqa7m74hvhht
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Wed 2009-01-07 10:38:11 +1100
        message:
          Merge from bzr.dev
        added:
          bzrlib/_chunks_to_lines_py.py  _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
          bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
          bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
          bzrlib/atomicfile.py           atomicfile.py-20050509044450-dbd24e6c564f7c66
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/patiencediff.py         patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
          bzrlib/shelf_ui.py             shelver.py-20081005210102-33worgzwrtdw0yrm-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
          bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          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_shelf.py     test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
          bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
          bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml4.py                 xml4.py-20050916091259-db5ab55e7e6ca324
          bzrlib/xml5.py                 xml5.py-20080328030717-t9guwinq8hom0ar3-1
          bzrlib/xml7.py                 xml7.py-20061029182747-d5tiiny21bvrd2jj-1
          bzrlib/xml8.py                 xml5.py-20050907032657-aac8f960815b66b1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
          doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
          doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
          doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
          doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
        ------------------------------------------------------------
        revno: 3842.3.14
        revision-id: andrew.bennetts at canonical.com-20081212075837-5rmjp846gxxd1tvr
        parent: andrew.bennetts at canonical.com-20081209060456-g5yeuf0t3e2d2stt
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Fri 2008-12-12 18:58:37 +1100
        message:
          Small hacks to make 'bzr init bzr://host/foo; bzr push bzr://host/foo' in bzr.dev successfully use the insert_record_stream RPC.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        ------------------------------------------------------------
        revno: 3842.3.13
        revision-id: andrew.bennetts at canonical.com-20081209060456-g5yeuf0t3e2d2stt
        parent: andrew.bennetts at canonical.com-20081209051453-ep6fojv6q31w9eyu
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Tue 2008-12-09 17:04:56 +1100
        message:
          Remove SmartServerVersionedFilesGetParentMap.
        modified:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        ------------------------------------------------------------
        revno: 3842.3.12
        revision-id: andrew.bennetts at canonical.com-20081209051453-ep6fojv6q31w9eyu
        parent: andrew.bennetts at canonical.com-20081209050615-4xps1j3z0sljfja5
        parent: andrew.bennetts at canonical.com-20081209051436-3vet9gjvh0rzgl9c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Tue 2008-12-09 16:14:53 +1100
        message:
          Merge loom thread.
        ------------------------------------------------------------
        revno: 3842.3.11
        revision-id: andrew.bennetts at canonical.com-20081209050615-4xps1j3z0sljfja5
        parent: andrew.bennetts at canonical.com-20081209050414-kg71l0r87i66br79
        parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Tue 2008-12-09 16:06:15 +1100
        message:
          Merge from bzr.dev.
        added:
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          contrib/convert_to_1.9.py      convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
          bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/python-compat.h         pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
        ------------------------------------------------------------
        revno: 3842.3.10
        revision-id: andrew.bennetts at canonical.com-20081209050414-kg71l0r87i66br79
        parent: andrew.bennetts at canonical.com-20081128101130-wonkakulwknf4mpa
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Tue 2008-12-09 16:04:14 +1100
        message:
          More comments.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3842.3.9
        revision-id: andrew.bennetts at canonical.com-20081128101130-wonkakulwknf4mpa
        parent: andrew.bennetts at canonical.com-20081128094308-xwq1tcq5yg4zdkbk
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Fri 2008-11-28 21:11:30 +1100
        message:
          Backing up the stream so that we can fallback correctly.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3842.3.8
        revision-id: andrew.bennetts at canonical.com-20081128094308-xwq1tcq5yg4zdkbk
        parent: andrew.bennetts at canonical.com-20081128094221-hvxddevo3vcvpvtn
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Fri 2008-11-28 20:43:08 +1100
        message:
          Remove some debugging cruft.
        modified:
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
        ------------------------------------------------------------
        revno: 3842.3.7
        revision-id: andrew.bennetts at canonical.com-20081128094221-hvxddevo3vcvpvtn
        parent: andrew.bennetts at canonical.com-20081128065802-f0ppt9qv0hpwoj0x
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Fri 2008-11-28 20:42:21 +1100
        message:
          Implement a simple fallback (that buffers the whole record stream) for dealing with older servers.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        ------------------------------------------------------------
        revno: 3842.3.6
        revision-id: andrew.bennetts at canonical.com-20081128065802-f0ppt9qv0hpwoj0x
        parent: andrew.bennetts at canonical.com-20081126131717-h8y9qk87hfkjf963
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Fri 2008-11-28 17:58:02 +1100
        message:
          Tweak bencode.py to decode sequences as tuples, not lists.
        modified:
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
        ------------------------------------------------------------
        revno: 3842.3.5
        revision-id: andrew.bennetts at canonical.com-20081126131717-h8y9qk87hfkjf963
        parent: andrew.bennetts at canonical.com-20081126113537-9vn1v1yo4gkxi05o
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Thu 2008-11-27 00:17:17 +1100
        message:
          Remove some debugging cruft, make more tests pass.
        modified:
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        ------------------------------------------------------------
        revno: 3842.3.4
        revision-id: andrew.bennetts at canonical.com-20081126113537-9vn1v1yo4gkxi05o
        parent: andrew.bennetts at canonical.com-20081120104923-8rfafwxwzc4ujkj4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Wed 2008-11-26 22:35:37 +1100
        message:
          TestStacking.test_fetch_copies_from_stacked_on now passes using the VersionedFile.insert_record_stream RPC; lots of debugging cruft needs removal though.
        added:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        modified:
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
        ------------------------------------------------------------
        revno: 3842.3.3
        revision-id: andrew.bennetts at canonical.com-20081120104923-8rfafwxwzc4ujkj4
        parent: andrew.bennetts at canonical.com-20081120104339-86nxvaaclh6fdyp4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Thu 2008-11-20 21:49:23 +1100
        message:
          Remove RPC registration for VersionedFiles.get_parent_map, not Repository.get_parent_map.
        modified:
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
        ------------------------------------------------------------
        revno: 3842.3.2
        revision-id: andrew.bennetts at canonical.com-20081120104339-86nxvaaclh6fdyp4
        parent: andrew.bennetts at canonical.com-20081120103056-05g6c6nv30ceyxdx
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Thu 2008-11-20 21:43:39 +1100
        message:
          Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
        removed:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3842.3.1
        revision-id: andrew.bennetts at canonical.com-20081120103056-05g6c6nv30ceyxdx
        parent: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
        parent: andrew.bennetts at canonical.com-20080924015245-nm3rnompf1wux142
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: RemoteVersionedFile
        timestamp: Thu 2008-11-20 21:30:56 +1100
        message:
          Merge RemoteVersionedFiles class from hpss-push-rpc.
        added:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3695.2.6
        revision-id: andrew.bennetts at canonical.com-20080924015245-nm3rnompf1wux142
        parent: andrew.bennetts at canonical.com-20080922093304-jm4ky0x20qssbenc
        parent: pqm at pqm.ubuntu.com-20080922180718-n946121e40ql2bb3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-push-rpc
        timestamp: Wed 2008-09-24 11:52:45 +1000
        message:
          Merge from bzr.dev.
        renamed:
          bzrlib/tests/repository_implementations/ => bzrlib/tests/per_repository/ repository_implementations-20060131092037-ec97814745cc6128
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzr.ico                        bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
          bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
          bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
          bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
          bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
          bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
          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/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
          bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
          bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
          bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
          bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
          bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
          bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
          bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          profile_imports.py             profile_imports.py-20060618020306-k5uw80achysrokj9-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
        ------------------------------------------------------------
        revno: 3695.2.5
        revision-id: andrew.bennetts at canonical.com-20080922093304-jm4ky0x20qssbenc
        parent: andrew.bennetts at canonical.com-20080911002618-z1ngkakxitjfg9lx
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-push-rpc
        timestamp: Mon 2008-09-22 19:33:04 +1000
        message:
          More tests, and slightly simpler encoding of VersionedFiles.get_parent_map responses.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3695.2.4
        revision-id: andrew.bennetts at canonical.com-20080911002618-z1ngkakxitjfg9lx
        parent: andrew.bennetts at canonical.com-20080909114054-m5kddq501jzmxqeo
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-push-rpc
        timestamp: Thu 2008-09-11 10:26:18 +1000
        message:
          Add a test that the client can interoperate with a server that does not support the VersionedFiles.get_parent_map RPC.
        modified:
          bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3695.2.3
        revision-id: andrew.bennetts at canonical.com-20080909114054-m5kddq501jzmxqeo
        parent: andrew.bennetts at canonical.com-20080908091136-4g73wcnla3h7lynq
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-push-rpc
        timestamp: Tue 2008-09-09 21:40:54 +1000
        message:
          Use a simple custom serialiser rather than bencode for VersionedFile.get_parent_map results.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        ------------------------------------------------------------
        revno: 3695.2.2
        revision-id: andrew.bennetts at canonical.com-20080908091136-4g73wcnla3h7lynq
        parent: andrew.bennetts at canonical.com-20080908055218-22ytu21ra0sid2kk
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-push-rpc
        timestamp: Mon 2008-09-08 19:11:36 +1000
        message:
          Rough cut of implementing and using a VersionedFiles.get_parent_map RPC.
        added:
          bzrlib/smart/versionedfiles.py versionedfiles.py-20080908091044-zk43rd2m1p521wlq-1
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
        ------------------------------------------------------------
        revno: 3695.2.1
        revision-id: andrew.bennetts at canonical.com-20080908055218-22ytu21ra0sid2kk
        parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-push-rpc
        timestamp: Mon 2008-09-08 15:52:18 +1000
        message:
          Define and use a simple RemoteVersionedFiles class that delegates to the real VF object for everything.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 3955.1.25
    revision-id: pqm at pqm.ubuntu.com-20090204045809-piqek6zlyl0x5ncw
    parent: pqm at pqm.ubuntu.com-20090203220822-5duwp3g1fj9kc9qd
    parent: andrew.bennetts at canonical.com-20090204041915-a57oazgobkmuce9e
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2009-02-04 04:58:09 +0000
    message:
      Workaround a bug in pdb.post_mortem. (Andrew Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
        ------------------------------------------------------------
        revno: 3955.22.3
        revision-id: andrew.bennetts at canonical.com-20090204041915-a57oazgobkmuce9e
        parent: andrew.bennetts at canonical.com-20090204041014-ny61o8sh69ee2nnw
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: pdb-workaround
        timestamp: Wed 2009-02-04 15:19:15 +1100
        message:
          Add NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3955.22.2
        revision-id: andrew.bennetts at canonical.com-20090204041014-ny61o8sh69ee2nnw
        parent: andrew.bennetts at canonical.com-20090203055031-q0rde12116uv20t7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: pdb-workaround
        timestamp: Wed 2009-02-04 15:10:14 +1100
        message:
          Only use pdb.post_mortem workaround with Pythons older than 2.6.
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
        ------------------------------------------------------------
        revno: 3955.22.1
        revision-id: andrew.bennetts at canonical.com-20090203055031-q0rde12116uv20t7
        parent: pqm at pqm.ubuntu.com-20090202091414-4q20mjzsvp03vyfc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: pdb-workaround
        timestamp: Tue 2009-02-03 16:50:31 +1100
        message:
          Add workaround for buggy pdb.post_mortem.
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
    ------------------------------------------------------------
    revno: 3955.1.24
    revision-id: pqm at pqm.ubuntu.com-20090203220822-5duwp3g1fj9kc9qd
    parent: pqm at pqm.ubuntu.com-20090202091414-4q20mjzsvp03vyfc
    parent: robertc at robertcollins.net-20090203013845-ulfy3d891op4zqoe
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2009-02-03 22:08:22 +0000
    message:
      (robertc) Use a list not a tuple for chunks returned from
      	FullTextContentFactory objects,
      	because otherwise code tries to assign to tuples. (Robert Collins)
    modified:
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3955.21.1
        revision-id: robertc at robertcollins.net-20090203013845-ulfy3d891op4zqoe
        parent: pqm at pqm.ubuntu.com-20090131231933-8o4phfvmuuizyyn6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: fix-chunked
        timestamp: Tue 2009-02-03 12:38:45 +1100
        message:
          Use a list not a tuple for chunks returned from FullTextContentFactory objects, because otherwise code tries to assign to tuples.
        modified:
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3955.1.23
    revision-id: pqm at pqm.ubuntu.com-20090202091414-4q20mjzsvp03vyfc
    parent: pqm at pqm.ubuntu.com-20090202053119-adgabjjho5g49v76
    parent: ian.clatworthy at canonical.com-20090202083117-wui3o7auvyt20wta
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-02-02 09:14:14 +0000
    message:
      Faster log (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3955.20.1
        revision-id: ian.clatworthy at canonical.com-20090202083117-wui3o7auvyt20wta
        parent: pqm at pqm.ubuntu.com-20090131231933-8o4phfvmuuizyyn6
        parent: ian.clatworthy at canonical.com-20090202082854-20ktgsdiqcvc2uf9
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Mon 2009-02-02 18:31:17 +1000
        message:
          Faster log (Ian Clatworthy)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3936.3.43
        revision-id: ian.clatworthy at canonical.com-20090202082854-20ktgsdiqcvc2uf9
        parent: ian.clatworthy at canonical.com-20090202055626-ptlb3jr3sb00v9hh
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Mon 2009-02-02 18:28:54 +1000
        message:
          back out delta filtering for ranges - too slow on MySQL branch still
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.42
        revision-id: ian.clatworthy at canonical.com-20090202055626-ptlb3jr3sb00v9hh
        parent: ian.clatworthy at canonical.com-20090202054708-sjisrybw25x3ch61
        parent: pqm at pqm.ubuntu.com-20090131231933-8o4phfvmuuizyyn6
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Mon 2009-02-02 15:56:26 +1000
        message:
          merge bzr.dev r3976
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.41
        revision-id: ian.clatworthy at canonical.com-20090202054708-sjisrybw25x3ch61
        parent: ian.clatworthy at canonical.com-20090202054313-5iokm54sinu9i2vd
        parent: ian.clatworthy at canonical.com-20090129091435-s719ii56so4q826r
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Mon 2009-02-02 15:47:08 +1000
        message:
          merge latest iter-merge-sorted-revisions
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3936.3.40
        revision-id: ian.clatworthy at canonical.com-20090202054313-5iokm54sinu9i2vd
        parent: ian.clatworthy at canonical.com-20090131041743-3v7wmbojb55bx0pq
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Mon 2009-02-02 15:43:13 +1000
        message:
          review feedback from jam
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.39
        revision-id: ian.clatworthy at canonical.com-20090131041743-3v7wmbojb55bx0pq
        parent: ian.clatworthy at canonical.com-20090128112929-db0zx88s2ddsf21k
        parent: pqm at pqm.ubuntu.com-20090130185542-dbj7mapm1fvtwm3y
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Sat 2009-01-31 14:17:43 +1000
        message:
          merge bzr.dev r3975
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
          bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 3936.3.38
        revision-id: ian.clatworthy at canonical.com-20090128112929-db0zx88s2ddsf21k
        parent: ian.clatworthy at canonical.com-20090128112721-sr8ahk3zg7f63g85
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-28 21:29:29 +1000
        message:
          tweak NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3936.3.37
        revision-id: ian.clatworthy at canonical.com-20090128112721-sr8ahk3zg7f63g85
        parent: ian.clatworthy at canonical.com-20090127125601-z436vlc25r9l2q18
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-28 21:27:21 +1000
        message:
          selectively delay graph generation, not always
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.36
        revision-id: ian.clatworthy at canonical.com-20090127125601-z436vlc25r9l2q18
        parent: ian.clatworthy at canonical.com-20090127121736-6lnepki0par6606b
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 22:56:01 +1000
        message:
          minor comment polish & refactoring
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.35
        revision-id: ian.clatworthy at canonical.com-20090127121736-6lnepki0par6606b
        parent: ian.clatworthy at canonical.com-20090127120003-ykjl7nlhdd1oy8l3
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 22:17:36 +1000
        message:
          simplify single revision logic
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.34
        revision-id: ian.clatworthy at canonical.com-20090127120003-ykjl7nlhdd1oy8l3
        parent: ian.clatworthy at canonical.com-20090127110847-nzd0csfhpuf5rl3m
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 22:00:03 +1000
        message:
          return _mainline_revs() API as used in missing.py
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.33
        revision-id: ian.clatworthy at canonical.com-20090127110847-nzd0csfhpuf5rl3m
        parent: ian.clatworthy at canonical.com-20090127064917-poxu010onn6u147b
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 21:08:47 +1000
        message:
          only generate deltas for file matching as long as necessary
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.32
        revision-id: ian.clatworthy at canonical.com-20090127064917-poxu010onn6u147b
        parent: ian.clatworthy at canonical.com-20090127054211-m4z2x5od2xyljopc
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 16:49:17 +1000
        message:
          always delay merge graph generation until necessary
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.31
        revision-id: ian.clatworthy at canonical.com-20090127054211-m4z2x5od2xyljopc
        parent: ian.clatworthy at canonical.com-20090127040514-z72i60ixqx1u0abz
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 15:42:11 +1000
        message:
          nicer obvious ancestor checking
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.30
        revision-id: ian.clatworthy at canonical.com-20090127040514-z72i60ixqx1u0abz
        parent: ian.clatworthy at canonical.com-20090127012440-1658qsg5nxc6m70r
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 14:05:14 +1000
        message:
          use iter_merge_sorted_revisions() with stop_range feature
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3936.3.29
        revision-id: ian.clatworthy at canonical.com-20090127012440-1658qsg5nxc6m70r
        parent: ian.clatworthy at canonical.com-20090124123817-q11ovizmi67y5gva
        parent: ian.clatworthy at canonical.com-20090127001039-ill4gah3eqx7w7gz
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-27 11:24:40 +1000
        message:
          merge stop_rule support in iter_merge_sorted_revisions()
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3936.3.28
        revision-id: ian.clatworthy at canonical.com-20090124123817-q11ovizmi67y5gva
        parent: ian.clatworthy at canonical.com-20090124123205-s97pvjvk4ym48nc4
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Sat 2009-01-24 22:38:17 +1000
        message:
          api compatibility: calculate_view_revisions rebases merge depth again
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3936.3.27
        revision-id: ian.clatworthy at canonical.com-20090124123205-s97pvjvk4ym48nc4
        parent: ian.clatworthy at canonical.com-20090122060442-1ehshkxz2o1uq65f
        parent: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Sat 2009-01-24 22:32:05 +1000
        message:
          merge bzr.dev r3957
        added:
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
        ------------------------------------------------------------
        revno: 3936.3.26
        revision-id: ian.clatworthy at canonical.com-20090122060442-1ehshkxz2o1uq65f
        parent: ian.clatworthy at canonical.com-20090122055104-4j1ek6agkwgncx49
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Thu 2009-01-22 16:04:42 +1000
        message:
          use new dotted-revno-revision-id conversion methods to simplify & speed up code
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.25
        revision-id: ian.clatworthy at canonical.com-20090122055104-4j1ek6agkwgncx49
        parent: ian.clatworthy at canonical.com-20090122053626-g1ksg9j7iu3n6ain
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Thu 2009-01-22 15:51:04 +1000
        message:
          fix bug when start/end revision are integers
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.24
        revision-id: ian.clatworthy at canonical.com-20090122053626-g1ksg9j7iu3n6ain
        parent: ian.clatworthy at canonical.com-20090122053159-rmo3qky7n35phy9s
        parent: ian.clatworthy at canonical.com-20090122053359-0ozol6xxjiyv2p4q
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Thu 2009-01-22 15:36:26 +1000
        message:
          merge bzr.dotted-revno-to-revision-id branch again
        added:
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        ------------------------------------------------------------
        revno: 3936.3.23
        revision-id: ian.clatworthy at canonical.com-20090122053159-rmo3qky7n35phy9s
        parent: ian.clatworthy at canonical.com-20090118172010-j11wzy7adzqi79fr
        parent: ian.clatworthy at canonical.com-20090122051710-gqka9rzkxc93p20m
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Thu 2009-01-22 15:31:59 +1000
        message:
          merge bzr.dotted-revno-to-revision-id branch
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_rules.py     test_properties.py-20080506033501-3p9kmuob25dho8xl-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
        ------------------------------------------------------------
        revno: 3936.3.22
        revision-id: ian.clatworthy at canonical.com-20090118172010-j11wzy7adzqi79fr
        parent: ian.clatworthy at canonical.com-20090118164531-wxgk6ac3ejrtychl
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Mon 2009-01-19 03:20:10 +1000
        message:
          make incremental file logging fast again
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.21
        revision-id: ian.clatworthy at canonical.com-20090118164531-wxgk6ac3ejrtychl
        parent: ian.clatworthy at canonical.com-20090116154148-hvqeiv3r8sp3ncis
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Mon 2009-01-19 02:45:31 +1000
        message:
          make log -rX.. as fast as log -rX..-1
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3936.3.20
        revision-id: ian.clatworthy at canonical.com-20090116154148-hvqeiv3r8sp3ncis
        parent: ian.clatworthy at canonical.com-20090116144304-tg4l4sl49ahqxpze
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Sat 2009-01-17 01:41:48 +1000
        message:
          must use per-file-graph for full history still
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.19
        revision-id: ian.clatworthy at canonical.com-20090116144304-tg4l4sl49ahqxpze
        parent: ian.clatworthy at canonical.com-20090116140347-aqboeyop0g19p3u7
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Sat 2009-01-17 00:43:04 +1000
        message:
          NEW item
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3936.3.18
        revision-id: ian.clatworthy at canonical.com-20090116140347-aqboeyop0g19p3u7
        parent: ian.clatworthy at canonical.com-20090116133219-m7j3rcd68v5c4x3h
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Sat 2009-01-17 00:03:47 +1000
        message:
          faster incremental results for FILE logging
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.17
        revision-id: ian.clatworthy at canonical.com-20090116133219-m7j3rcd68v5c4x3h
        parent: ian.clatworthy at canonical.com-20090116131826-5lw7zzbzfiq7n4vd
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 23:32:19 +1000
        message:
          delta filtering bug fix
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.16
        revision-id: ian.clatworthy at canonical.com-20090116131826-5lw7zzbzfiq7n4vd
        parent: ian.clatworthy at canonical.com-20090116114255-qdbi7gtarzlirbcu
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 23:18:26 +1000
        message:
          use deltas to match files in selected use cases
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.15
        revision-id: ian.clatworthy at canonical.com-20090116114255-qdbi7gtarzlirbcu
        parent: ian.clatworthy at canonical.com-20090116110851-k7vhta4o4n1qub82
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 21:42:55 +1000
        message:
          faster long log for a limited range with no merges
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.14
        revision-id: ian.clatworthy at canonical.com-20090116110851-k7vhta4o4n1qub82
        parent: ian.clatworthy at canonical.com-20090116103954-zuc1mnp2wytgdwwg
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 21:08:51 +1000
        message:
          bug fix
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.13
        revision-id: ian.clatworthy at canonical.com-20090116103954-zuc1mnp2wytgdwwg
        parent: ian.clatworthy at canonical.com-20090116082834-07gc3o54z09xos4w
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 20:39:54 +1000
        message:
          feedback from jameinel
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.12
        revision-id: ian.clatworthy at canonical.com-20090116082834-07gc3o54z09xos4w
        parent: ian.clatworthy at canonical.com-20090116052709-crdqz9q07ens4vc0
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 18:28:34 +1000
        message:
          more single revision & sequence tuning
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3936.3.11
        revision-id: ian.clatworthy at canonical.com-20090116052709-crdqz9q07ens4vc0
        parent: ian.clatworthy at canonical.com-20090114071752-q4t19py601nrdrg4
        parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Fri 2009-01-16 15:27:09 +1000
        message:
          merge bzr.dev r3943
        added:
          bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
          doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
          doc/news-template.txt          newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3936.3.10
        revision-id: ian.clatworthy at canonical.com-20090114071752-q4t19py601nrdrg4
        parent: ian.clatworthy at canonical.com-20090114063539-t4rtvt877xpaqwp3
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-14 17:17:52 +1000
        message:
          more single revision clean-up
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.9
        revision-id: ian.clatworthy at canonical.com-20090114063539-t4rtvt877xpaqwp3
        parent: ian.clatworthy at canonical.com-20090114054418-zpoypade4ram52t8
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-14 16:35:39 +1000
        message:
          first cut at single revision clean-up
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.8
        revision-id: ian.clatworthy at canonical.com-20090114054418-zpoypade4ram52t8
        parent: ian.clatworthy at canonical.com-20090114053534-oms12p9qtm3uc12y
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-14 15:44:18 +1000
        message:
          back-out --strict
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3936.3.7
        revision-id: ian.clatworthy at canonical.com-20090114053534-oms12p9qtm3uc12y
        parent: ian.clatworthy at canonical.com-20090113184638-8n9nk7ir9cta514h
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-14 15:35:34 +1000
        message:
          move fileid filtering up a layer
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3936.3.6
        revision-id: ian.clatworthy at canonical.com-20090113184638-8n9nk7ir9cta514h
        parent: ian.clatworthy at canonical.com-20090113150315-qs02m5yy497ct3bt
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-14 04:46:38 +1000
        message:
          add & use _NonMainlineRevisionLimit exception
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.5
        revision-id: ian.clatworthy at canonical.com-20090113150315-qs02m5yy497ct3bt
        parent: ian.clatworthy at canonical.com-20090113093726-o10gqs4rqrh73ym6
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Wed 2009-01-14 01:03:15 +1000
        message:
          get single_merge_revision tests passing again
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.4
        revision-id: ian.clatworthy at canonical.com-20090113093726-o10gqs4rqrh73ym6
        parent: ian.clatworthy at canonical.com-20090113092406-mp38d8jv2vdyg1vm
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-13 19:37:26 +1000
        message:
          fix empty_branch log
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.3
        revision-id: ian.clatworthy at canonical.com-20090113092406-mp38d8jv2vdyg1vm
        parent: ian.clatworthy at canonical.com-20090113055725-l5k8cjxdbwlp0b0y
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-13 19:24:06 +1000
        message:
          add --strict and more refactoring
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3936.3.2
        revision-id: ian.clatworthy at canonical.com-20090113055725-l5k8cjxdbwlp0b0y
        parent: ian.clatworthy at canonical.com-20090113033933-4jqnpz7igopdonzo
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-13 15:57:25 +1000
        message:
          minor cleanups
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3936.3.1
        revision-id: ian.clatworthy at canonical.com-20090113033933-4jqnpz7igopdonzo
        parent: pqm at pqm.ubuntu.com-20090112185737-d6kwagahecadwfce
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-refactor
        timestamp: Tue 2009-01-13 13:39:33 +1000
        message:
          refactor _show_log
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
    ------------------------------------------------------------
    revno: 3955.1.22
    revision-id: pqm at pqm.ubuntu.com-20090202053119-adgabjjho5g49v76
    parent: pqm at pqm.ubuntu.com-20090131231933-8o4phfvmuuizyyn6
    parent: tim.penhey at canonical.com-20090128221627-mctkpl6un050cyfn
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-02-02 05:31:19 +0000
    message:
      (thumper) Refactor patch stat generation to make int values
      	accessible.
    modified:
      bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
      bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
        ------------------------------------------------------------
        revno: 3946.4.1
        revision-id: tim.penhey at canonical.com-20090128221627-mctkpl6un050cyfn
        parent: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
        committer: Tim Penhey <tim.penhey at canonical.com>
        branch nick: patch_stats
        timestamp: Thu 2009-01-29 11:16:27 +1300
        message:
          Extract out the counting of the stats values.
        modified:
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
    ------------------------------------------------------------
    revno: 3955.1.21
    revision-id: pqm at pqm.ubuntu.com-20090131231933-8o4phfvmuuizyyn6
    parent: pqm at pqm.ubuntu.com-20090130185542-dbj7mapm1fvtwm3y
    parent: ian.clatworthy at canonical.com-20090131223819-uufv50vychm3mnki
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2009-01-31 23:19:33 +0000
    message:
      add stop-rule to iter_merge_sorted_revisions() (Ian Clatworthy)
    modified:
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3955.19.1
        revision-id: ian.clatworthy at canonical.com-20090131223819-uufv50vychm3mnki
        parent: pqm at pqm.ubuntu.com-20090130185542-dbj7mapm1fvtwm3y
        parent: ian.clatworthy at canonical.com-20090129091435-s719ii56so4q826r
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Sun 2009-02-01 08:38:19 +1000
        message:
          add stop-rule to iter_merge_sorted_revisions()
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3955.18.4
        revision-id: ian.clatworthy at canonical.com-20090129091435-s719ii56so4q826r
        parent: ian.clatworthy at canonical.com-20090127043046-0x22acyb7jbanlfl
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Thu 2009-01-29 19:14:35 +1000
        message:
          implement with-merges by checking for left-hand parent, not depth
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3955.18.3
        revision-id: ian.clatworthy at canonical.com-20090127043046-0x22acyb7jbanlfl
        parent: ian.clatworthy at canonical.com-20090127042757-slszc22d2p34ualk
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Tue 2009-01-27 14:30:46 +1000
        message:
          apply fix for single revision case
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3955.18.2
        revision-id: ian.clatworthy at canonical.com-20090127042757-slszc22d2p34ualk
        parent: ian.clatworthy at canonical.com-20090127001039-ill4gah3eqx7w7gz
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Tue 2009-01-27 14:27:57 +1000
        message:
          add single revision tests
        modified:
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3955.18.1
        revision-id: ian.clatworthy at canonical.com-20090127001039-ill4gah3eqx7w7gz
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Tue 2009-01-27 10:10:39 +1000
        message:
          add stop_rule to Branch.iter_merge_sorted_revisions()
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
    ------------------------------------------------------------
    revno: 3955.1.20
    revision-id: pqm at pqm.ubuntu.com-20090130185542-dbj7mapm1fvtwm3y
    parent: pqm at pqm.ubuntu.com-20090130031028-y70uzzpad9c47v09
    parent: jelmer at samba.org-20090130181241-cbb2x802djvfp6cs
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2009-01-30 18:55:42 +0000
    message:
      (Jelmer) Support symlinks with unicode characters in the symlink name.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
      bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 3949.6.6
        revision-id: jelmer at samba.org-20090130181241-cbb2x802djvfp6cs
        parent: jelmer at samba.org-20090129164644-xa3bxpnb3yp45bjo
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: unicode-symlinks
        timestamp: Fri 2009-01-30 19:12:41 +0100
        message:
          Skip unicode symlink tests on non-unicode file systems.
        modified:
          bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
        ------------------------------------------------------------
        revno: 3949.6.5
        revision-id: jelmer at samba.org-20090129164644-xa3bxpnb3yp45bjo
        parent: jelmer at samba.org-20090128103825-kipwyk4apyn5khf9
        parent: pqm at pqm.ubuntu.com-20090129131703-lgus0aiclez3isj6
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: unicode-symlinks
        timestamp: Thu 2009-01-29 17:46:44 +0100
        message:
          Merge bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
          bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3949.6.4
        revision-id: jelmer at samba.org-20090128103825-kipwyk4apyn5khf9
        parent: jelmer at samba.org-20090128103803-hqonmgfjb13mblj7
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: unicode-symlinks
        timestamp: Wed 2009-01-28 11:38:25 +0100
        message:
          Encode filenames on file system in fs encoding during tests.
        modified:
          bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
        ------------------------------------------------------------
        revno: 3949.6.3
        revision-id: jelmer at samba.org-20090128103803-hqonmgfjb13mblj7
        parent: jelmer at samba.org-20090128093831-a8i03wn5zwtawzzk
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: unicode-symlinks
        timestamp: Wed 2009-01-28 11:38:03 +0100
        message:
          Fix unicode symlink handling when the C extensions are not built.
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3949.6.2
        revision-id: jelmer at samba.org-20090128093831-a8i03wn5zwtawzzk
        parent: jelmer at samba.org-20090122204135-9kwta8oeyrrlfbp0
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: unicode-symlinks
        timestamp: Wed 2009-01-28 10:38:31 +0100
        message:
          Merge bzr.dev.
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3949.6.1
        revision-id: jelmer at samba.org-20090122204135-9kwta8oeyrrlfbp0
        parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Thu 2009-01-22 21:41:35 +0100
        message:
          Support symlinks with non-ascii characters in the symlink filename.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 3955.1.19
    revision-id: pqm at pqm.ubuntu.com-20090130031028-y70uzzpad9c47v09
    parent: pqm at pqm.ubuntu.com-20090129131703-lgus0aiclez3isj6
    parent: john at arbash-meinel.com-20090129230103-do6e8kwjg8ns0oyp
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2009-01-30 03:10:28 +0000
    message:
      (jam) Fix a small bug in knit.KnitVersionedFiles._check_should_delta
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3955.17.1
        revision-id: john at arbash-meinel.com-20090129230103-do6e8kwjg8ns0oyp
        parent: pqm at pqm.ubuntu.com-20090129131703-lgus0aiclez3isj6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2009-01-29 17:01:03 -0600
        message:
          Trivially fix a bug in _check_should_delta when a parent is not present.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3955.1.18
    revision-id: pqm at pqm.ubuntu.com-20090129131703-lgus0aiclez3isj6
    parent: pqm at pqm.ubuntu.com-20090129071857-l3ikkrm6b1rx96bx
    parent: ian.clatworthy at canonical.com-20090129122429-irb67ivtr2gbvx2z
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-01-29 13:17:03 +0000
    message:
      Use historical context for file logging (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3955.16.2
        revision-id: ian.clatworthy at canonical.com-20090129122429-irb67ivtr2gbvx2z
        parent: ian.clatworthy at canonical.com-20090129075743-5cs64pvnjwyrs5el
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Thu 2009-01-29 22:24:29 +1000
        message:
          fix failing test when history completely empty
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3955.16.1
        revision-id: ian.clatworthy at canonical.com-20090129075743-5cs64pvnjwyrs5el
        parent: pqm at pqm.ubuntu.com-20090129071857-l3ikkrm6b1rx96bx
        parent: ian.clatworthy at canonical.com-20090129075346-4zyjjh9a0yw07t42
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Thu 2009-01-29 17:57:43 +1000
        message:
          Use historical context for file logging (Ian Clatworthy)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.6.4
        revision-id: ian.clatworthy at canonical.com-20090129075346-4zyjjh9a0yw07t42
        parent: ian.clatworthy at canonical.com-20090118061118-21mjqrjiaxwz1rdl
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-file-Y-fix
        timestamp: Thu 2009-01-29 17:53:46 +1000
        message:
          review feedback from vila
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.6.3
        revision-id: ian.clatworthy at canonical.com-20090118061118-21mjqrjiaxwz1rdl
        parent: ian.clatworthy at canonical.com-20090117232859-ydewp5rfmuf0fqdy
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-file-Y-fix
        timestamp: Sun 2009-01-18 16:11:18 +1000
        message:
          search the start tree if the end tree doesn't have a file
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.6.2
        revision-id: ian.clatworthy at canonical.com-20090117232859-ydewp5rfmuf0fqdy
        parent: ian.clatworthy at canonical.com-20090117232106-m831x0own422es1l
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-file-Y-fix
        timestamp: Sun 2009-01-18 09:28:59 +1000
        message:
          improve error message
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.6.1
        revision-id: ian.clatworthy at canonical.com-20090117232106-m831x0own422es1l
        parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-file-Y-fix
        timestamp: Sun 2009-01-18 09:21:06 +1000
        message:
          find file using the end revision
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 3955.1.17
    revision-id: pqm at pqm.ubuntu.com-20090129071857-l3ikkrm6b1rx96bx
    parent: pqm at pqm.ubuntu.com-20090129064144-7kz4ibeppmn41zs9
    parent: ian.clatworthy at canonical.com-20090129063122-6yyql6ej6zwwfqzn
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-01-29 07:18:57 +0000
    message:
      log -n/--levels (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3955.15.1
        revision-id: ian.clatworthy at canonical.com-20090129063122-6yyql6ej6zwwfqzn
        parent: pqm at pqm.ubuntu.com-20090129060443-6hvfgxb55cd6r527
        parent: ian.clatworthy at canonical.com-20090129061825-8dbbry5u2vg0nwgp
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Thu 2009-01-29 16:31:22 +1000
        message:
          log -n/--levels (Ian Clatworthy)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.10
        revision-id: ian.clatworthy at canonical.com-20090129061825-8dbbry5u2vg0nwgp
        parent: ian.clatworthy at canonical.com-20090123090721-x2438gy3f0c1ocl0
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Thu 2009-01-29 16:18:25 +1000
        message:
          review feedback from vila
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.9
        revision-id: ian.clatworthy at canonical.com-20090123090721-x2438gy3f0c1ocl0
        parent: ian.clatworthy at canonical.com-20090123083933-qi3438mch4yev5mk
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Fri 2009-01-23 19:07:21 +1000
        message:
          get offset right when dotted-revno in column 1
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.8
        revision-id: ian.clatworthy at canonical.com-20090123083933-qi3438mch4yev5mk
        parent: ian.clatworthy at canonical.com-20090123033613-z8ptv0bfy2y6atbm
        parent: pqm at pqm.ubuntu.com-20090123042837-r1lyxrbk6nd5pp3g
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Fri 2009-01-23 18:39:33 +1000
        message:
          merge bzr.dev r3954
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
        ------------------------------------------------------------
        revno: 3947.1.7
        revision-id: ian.clatworthy at canonical.com-20090123033613-z8ptv0bfy2y6atbm
        parent: ian.clatworthy at canonical.com-20090122161308-bjto7ouxgoixjdpz
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Fri 2009-01-23 13:36:13 +1000
        message:
          tweak indenting/offsetting for --short given dotted revno lengths
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.6
        revision-id: ian.clatworthy at canonical.com-20090122161308-bjto7ouxgoixjdpz
        parent: ian.clatworthy at canonical.com-20090120215204-x3xpx3ymwutpcvai
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Fri 2009-01-23 02:13:08 +1000
        message:
          log -n/--level-count N option
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.5
        revision-id: ian.clatworthy at canonical.com-20090120215204-x3xpx3ymwutpcvai
        parent: ian.clatworthy at canonical.com-20090120084231-1woopagx76kp0lws
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Wed 2009-01-21 07:52:04 +1000
        message:
          rename --merge-revisions to --include-merges
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.4
        revision-id: ian.clatworthy at canonical.com-20090120084231-1woopagx76kp0lws
        parent: ian.clatworthy at canonical.com-20090120083731-kivv9vhmhy3kqfmq
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Tue 2009-01-20 18:42:31 +1000
        message:
          add NEWS item
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3947.1.3
        revision-id: ian.clatworthy at canonical.com-20090120083731-kivv9vhmhy3kqfmq
        parent: ian.clatworthy at canonical.com-20090120082114-56vno4rarr3bnk2c
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Tue 2009-01-20 18:37:31 +1000
        message:
          blackbox tests
        modified:
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3947.1.2
        revision-id: ian.clatworthy at canonical.com-20090120082114-56vno4rarr3bnk2c
        parent: ian.clatworthy at canonical.com-20090120071005-qgi0npvhnkdj1ln1
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Tue 2009-01-20 18:21:14 +1000
        message:
          formatter tests
        modified:
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
        ------------------------------------------------------------
        revno: 3947.1.1
        revision-id: ian.clatworthy at canonical.com-20090120071005-qgi0npvhnkdj1ln1
        parent: pqm at pqm.ubuntu.com-20090120032136-alahvfk4g7y8iczn
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-merge-revisions
        timestamp: Tue 2009-01-20 17:10:05 +1000
        message:
          add --merge-revisions to log
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
    ------------------------------------------------------------
    revno: 3955.1.16
    revision-id: pqm at pqm.ubuntu.com-20090129064144-7kz4ibeppmn41zs9
    parent: pqm at pqm.ubuntu.com-20090129060443-6hvfgxb55cd6r527
    parent: andrew.bennetts at canonical.com-20090129013651-qbt3lnl9i7jm89a3
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-01-29 06:41:44 +0000
    message:
      Fix bencoding of bools,
      	provide a bdecode_as_tuple function. (Andrew Bennetts)
    modified:
      bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
      bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
        ------------------------------------------------------------
        revno: 3923.4.2
        revision-id: andrew.bennetts at canonical.com-20090129013651-qbt3lnl9i7jm89a3
        parent: andrew.bennetts at canonical.com-20090107021847-iugqd7lq1lrtcebd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bencode-tweak
        timestamp: Thu 2009-01-29 12:36:51 +1100
        message:
          Tweaks prompted by John's review.
        modified:
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
          bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
        ------------------------------------------------------------
        revno: 3923.4.1
        revision-id: andrew.bennetts at canonical.com-20090107021847-iugqd7lq1lrtcebd
        parent: pqm at pqm.ubuntu.com-20090106171520-9pzjoqa7m74hvhht
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: bencode-tweak
        timestamp: Wed 2009-01-07 13:18:47 +1100
        message:
          Fix encoding of bools, provide a bdecode_tuple function.
        modified:
          bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
          bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
    ------------------------------------------------------------
    revno: 3955.1.15
    revision-id: pqm at pqm.ubuntu.com-20090129060443-6hvfgxb55cd6r527
    parent: pqm at pqm.ubuntu.com-20090129050743-a1sxceuybyrjfv8k
    parent: ian.clatworthy at canonical.com-20090129052136-1a0ue2k2rhxznu23
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-01-29 06:04:43 +0000
    message:
      Add local & remote revision filtering to missing (Marius Kruger)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
      bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3955.14.1
        revision-id: ian.clatworthy at canonical.com-20090129052136-1a0ue2k2rhxznu23
        parent: pqm at pqm.ubuntu.com-20090129050743-a1sxceuybyrjfv8k
        parent: amanic at gmail.com-20090125010347-qk0gt8kq6wtq6pt4
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Thu 2009-01-29 15:21:36 +1000
        message:
          Add local & remote revision filtering to missing (Marius Kruger)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3921.3.14
        revision-id: amanic at gmail.com-20090125010347-qk0gt8kq6wtq6pt4
        parent: amanic at gmail.com-20090125005526-800c7w470ggms63y
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Sun 2009-01-25 03:03:47 +0200
        message:
          put spaces after commas
        modified:
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3921.3.13
        revision-id: amanic at gmail.com-20090125005526-800c7w470ggms63y
        parent: amanic at gmail.com-20090125002626-y0r2jmu7o13bo3ou
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Sun 2009-01-25 02:55:26 +0200
        message:
          update missing documentation and blackbox test to better reflect `-r 3` behaviour.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
        ------------------------------------------------------------
        revno: 3921.3.12
        revision-id: amanic at gmail.com-20090125002626-y0r2jmu7o13bo3ou
        parent: amanic at gmail.com-20090124234908-xf4sh7ph1x0erax5
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Sun 2009-01-25 02:26:26 +0200
        message:
          add missing examples and NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3921.3.11
        revision-id: amanic at gmail.com-20090124234908-xf4sh7ph1x0erax5
        parent: amanic at gmail.com-20090124225433-0hm7jvh9aui3iihd
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Sun 2009-01-25 01:49:08 +0200
        message:
          swap options as per review:
            --revision, -r for remote revision filtering
            --my-revision for this revision filtering.
          
          Also updated the blackbox tests accordingly
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
        ------------------------------------------------------------
        revno: 3921.3.10
        revision-id: amanic at gmail.com-20090124225433-0hm7jvh9aui3iihd
        parent: amanic at gmail.com-20090102094753-8h0o3sxfvwz5wv9c
        parent: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Sun 2009-01-25 00:54:33 +0200
        message:
          merge with bzr.dev
        added:
          bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
          bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
          bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
          bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
          bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
          bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
          bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
          bzrlib/tests/ssl_certs/        ssl_certs-20071124141654-dc9za9nho2gmzbri-1
          bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
          bzrlib/tests/ssl_certs/ca.crt  ca.crt-20071124141703-j5hr254lm287lyut-7
          bzrlib/tests/ssl_certs/ca.key  ca.key-20071124141703-j5hr254lm287lyut-6
          bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
          bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
          bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
          bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
          bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
          doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
          doc/news-template.txt          newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/patiencediff.py         patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_rules.py     test_properties.py-20080506033501-3p9kmuob25dho8xl-1
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3921.3.9
        revision-id: amanic at gmail.com-20090102094753-8h0o3sxfvwz5wv9c
        parent: amanic at gmail.com-20090101232107-poye5hxejqgqq0sg
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Fri 2009-01-02 11:47:53 +0200
        message:
          * add some blackbox tests and another whitebox test
          * don't import _parse_revision_str lazily
          * remove some unneeded todos I added
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3921.3.8
        revision-id: amanic at gmail.com-20090101232107-poye5hxejqgqq0sg
        parent: amanic at gmail.com-20090101225617-2ztzo62eb2o02ym8
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Fri 2009-01-02 01:21:07 +0200
        message:
          * _filter_revs can now handle None and len=3 revs
          * fix up the rest of the white box tests
        modified:
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3921.3.7
        revision-id: amanic at gmail.com-20090101225617-2ztzo62eb2o02ym8
        parent: amanic at gmail.com-20090101220822-iopb8ag69ie4auno
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Fri 2009-01-02 00:56:17 +0200
        message:
          just filter the missing revisions once all have been calculated.
          (in stead of trying to be clever and adjust the tip and chaging the
          way the enumeration is done, which might even be slower)
        modified:
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3921.3.6
        revision-id: amanic at gmail.com-20090101220822-iopb8ag69ie4auno
        parent: amanic at gmail.com-20090101214606-lak9wejufcjehpm6
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Fri 2009-01-02 00:08:22 +0200
        message:
          * fix some indentation anomalies in cmd_missing
          * note that the `missing` revision filters are inclusive
          * some minor white space cleanups
          * add some param docstrings for missing.find_unmerged
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
        ------------------------------------------------------------
        revno: 3921.3.5
        revision-id: amanic at gmail.com-20090101214606-lak9wejufcjehpm6
        parent: amanic at gmail.com-20090101110637-t6d0xytq2gyiquji
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Thu 2009-01-01 23:46:06 +0200
        message:
          extract graph.is_between from builtins.cmd_tags.run, and test it
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
        ------------------------------------------------------------
        revno: 3921.3.4
        revision-id: amanic at gmail.com-20090101110637-t6d0xytq2gyiquji
        parent: amanic at gmail.com-20081231223701-u0u20omx4igpnqxd
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Thu 2009-01-01 13:06:37 +0200
        message:
          add support to filter on local and remote revisions
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
        ------------------------------------------------------------
        revno: 3921.3.3
        revision-id: amanic at gmail.com-20081231223701-u0u20omx4igpnqxd
        parent: amanic at gmail.com-20081231205214-2uaelv7n6s62wibs
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Thu 2009-01-01 00:37:01 +0200
        message:
          tried to add `bzr missing -r1..-1` but failed :(
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3921.3.2
        revision-id: amanic at gmail.com-20081231205214-2uaelv7n6s62wibs
        parent: amanic at gmail.com-20081231142930-4i3efine315vu0vc
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Wed 2008-12-31 22:52:14 +0200
        message:
          * rename _get_revid_in_bounds() -> _get_revid_in_range()
          * check if the new revid is actually in the branch before using it
          * add some more tests for find_unmerged in a range
        modified:
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
        ------------------------------------------------------------
        revno: 3921.3.1
        revision-id: amanic at gmail.com-20081231142930-4i3efine315vu0vc
        parent: pqm at pqm.ubuntu.com-20081229142916-z08eu2alga2acrh6
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.missing_revision
        timestamp: Wed 2008-12-31 16:29:30 +0200
        message:
          * add support for specifying a revision range to missing.find_unmerged
          * test it
          * let `restrict` parameter of TestFindUnmerged.assertUnmerged() default to 'all'
        modified:
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
    ------------------------------------------------------------
    revno: 3955.1.14
    revision-id: pqm at pqm.ubuntu.com-20090129050743-a1sxceuybyrjfv8k
    parent: pqm at pqm.ubuntu.com-20090128215712-i4lsbqdybozsp19x
    parent: andrew.bennetts at canonical.com-20090129023008-pz4wsc8rp7dsdybi
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2009-01-29 05:07:43 +0000
    message:
      Fix "LockableFiles ... was gc'd while unlocked" warning in
      	blackbox.test_shelve. (Andrew Bennetts)
    modified:
      bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
        ------------------------------------------------------------
        revno: 3955.13.1
        revision-id: andrew.bennetts at canonical.com-20090129023008-pz4wsc8rp7dsdybi
        parent: pqm at pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: shelve-test-warnings
        timestamp: Thu 2009-01-29 13:30:08 +1100
        message:
          Fix "LockableFiles ... was gc'd while unlocked" warning.
        modified:
          bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
    ------------------------------------------------------------
    revno: 3955.1.13
    revision-id: pqm at pqm.ubuntu.com-20090128215712-i4lsbqdybozsp19x
    parent: pqm at pqm.ubuntu.com-20090128174048-jd8qlat97q8m0c5q
    parent: jelmer at samba.org-20090128184255-bdmklkvm83ltk191
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2009-01-28 21:57:12 +0000
    message:
      (Jelmer) Use registry for revision specifiers.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
        ------------------------------------------------------------
        revno: 3955.12.3
        revision-id: jelmer at samba.org-20090128184255-bdmklkvm83ltk191
        parent: jelmer at samba.org-20090128184034-a05b5cs8fwdwoasd
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Wed 2009-01-28 19:42:55 +0100
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3955.12.2
        revision-id: jelmer at samba.org-20090128184034-a05b5cs8fwdwoasd
        parent: jelmer at samba.org-20090128152813-15xt6nhb9s8e1kmp
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Wed 2009-01-28 19:40:34 +0100
        message:
          Add backwards compatibility copy of SPEC_TYPES.
        modified:
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
        ------------------------------------------------------------
        revno: 3955.12.1
        revision-id: jelmer at samba.org-20090128152813-15xt6nhb9s8e1kmp
        parent: pqm at pqm.ubuntu.com-20090128105451-ih99x6vzhtmfysjf
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: lazy-revspecs
        timestamp: Wed 2009-01-28 16:28:13 +0100
        message:
          Register revision specifiers in a registry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
    ------------------------------------------------------------
    revno: 3955.1.12
    revision-id: pqm at pqm.ubuntu.com-20090128174048-jd8qlat97q8m0c5q
    parent: pqm at pqm.ubuntu.com-20090128105451-ih99x6vzhtmfysjf
    parent: v.ladeuil+lp at free.fr-20090128142739-50mm5oggx65rhsch
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2009-01-28 17:40:48 +0000
    message:
      (vila, jam) Make merge_content lca aware
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
        ------------------------------------------------------------
        revno: 3955.11.1
        revision-id: v.ladeuil+lp at free.fr-20090128142739-50mm5oggx65rhsch
        parent: pqm at pqm.ubuntu.com-20090128105451-ih99x6vzhtmfysjf
        parent: v.ladeuil+lp at free.fr-20090123210648-yfb39g22yyo83d3y
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr.integration
        timestamp: Wed 2009-01-28 15:27:39 +0100
        message:
          Make merge_content lca aware
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
        ------------------------------------------------------------
        revno: 3948.1.7
        revision-id: v.ladeuil+lp at free.fr-20090123210648-yfb39g22yyo83d3y
        parent: v.ladeuil+lp at free.fr-20090123194502-4i7lbovxs4s2oeh6
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: spurious-conflicts
        timestamp: Fri 2009-01-23 22:06:48 +0100
        message:
          Slight refactoring and test fixing.
          
          * bzrlib/tests/test_merge.py:
          (TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.
          
          * bzrlib/merge.py:
          (Merge3Merger._lca_multi_way): Fix doc reference.
          (Merge3Merger.merge_contents.contents_conflict): Try to delay
          this_pair evaulation to avoid unnecessary sha1 (impyling file read
          from disk) calculation. Also slightly refactor to avoid repeated
          file_id in trees calculations.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
        ------------------------------------------------------------
        revno: 3948.1.6
        revision-id: v.ladeuil+lp at free.fr-20090123194502-4i7lbovxs4s2oeh6
        parent: v.ladeuil+lp at free.fr-20090123194036-y35ps7a7xghq3q31
        parent: john at arbash-meinel.com-20090123165453-uh76h1nfqzshc707
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: spurious-conflicts
        timestamp: Fri 2009-01-23 20:45:02 +0100
        message:
          Remerge jam fix and its ancestry
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
            ------------------------------------------------------------
            revno: 3955.10.1
            revision-id: john at arbash-meinel.com-20090123165453-uh76h1nfqzshc707
            parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: jam-integration
            timestamp: Fri 2009-01-23 10:54:53 -0600
            message:
              Change the workings of merge_content to be lca aware.
            modified:
              bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
              bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
        ------------------------------------------------------------
        revno: 3948.1.5
        revision-id: v.ladeuil+lp at free.fr-20090123194036-y35ps7a7xghq3q31
        parent: v.ladeuil+lp at free.fr-20090123095303-gvzd86p6p2ytmhxz
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: spurious-conflicts
        timestamp: Fri 2009-01-23 20:40:36 +0100
        message:
          merge jam fix
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    revno: 3955.1.11
    revision-id: pqm at pqm.ubuntu.com-20090128105451-ih99x6vzhtmfysjf
    parent: pqm at pqm.ubuntu.com-20090128094113-ze5jnburw91g2e4n
    parent: jelmer at samba.org-20090128093139-j005iw0qi00110dz
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2009-01-28 10:54:51 +0000
    message:
      (Jelmer) Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
      bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
        ------------------------------------------------------------
        revno: 3949.5.2
        revision-id: jelmer at samba.org-20090128093139-j005iw0qi00110dz
        parent: jelmer at samba.org-20090122143640-ymqoypm29mcmi4ku
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: foreign-revid-show
        timestamp: Wed 2009-01-28 10:31:39 +0100
        message:
          Merge bzr.dev
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3949.5.1
        revision-id: jelmer at samba.org-20090122143640-ymqoypm29mcmi4ku
        parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: foreign-revid-show
        timestamp: Thu 2009-01-22 15:36:40 +0100
        message:
          Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
    ------------------------------------------------------------
    revno: 3955.1.10
    revision-id: pqm at pqm.ubuntu.com-20090128094113-ze5jnburw91g2e4n
    parent: pqm at pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
    parent: ian.clatworthy at canonical.com-20090127230635-70o18gj41uukrrzx
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2009-01-28 09:41:13 +0000
    message:
      Optionally show diff in log (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3955.9.1
        revision-id: ian.clatworthy at canonical.com-20090127230635-70o18gj41uukrrzx
        parent: pqm at pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
        parent: ian.clatworthy at canonical.com-20090127230221-mqumav0ghxkpybba
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Wed 2009-01-28 09:06:35 +1000
        message:
          Optionally show diff in log (Ian Clatworthy)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.5.6
        revision-id: ian.clatworthy at canonical.com-20090127230221-mqumav0ghxkpybba
        parent: ian.clatworthy at canonical.com-20090118033218-y15x0aja8awnjog3
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-show-diff
        timestamp: Wed 2009-01-28 09:02:21 +1000
        message:
          feedback from jam's review
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.5.5
        revision-id: ian.clatworthy at canonical.com-20090118033218-y15x0aja8awnjog3
        parent: ian.clatworthy at canonical.com-20090118031815-gb1m2e7p7ar4ayv1
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-show-diff
        timestamp: Sun 2009-01-18 13:32:18 +1000
        message:
          tweak option name as requested in bug report
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.5.4
        revision-id: ian.clatworthy at canonical.com-20090118031815-gb1m2e7p7ar4ayv1
        parent: ian.clatworthy at canonical.com-20090118023732-adg1rvlk94cw7wup
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-show-diff
        timestamp: Sun 2009-01-18 13:18:15 +1000
        message:
          filter diff by file
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.5.3
        revision-id: ian.clatworthy at canonical.com-20090118023732-adg1rvlk94cw7wup
        parent: ian.clatworthy at canonical.com-20090118013701-ogz42t2c8611fwx4
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-show-diff
        timestamp: Sun 2009-01-18 12:37:32 +1000
        message:
          add tests
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 3943.5.2
        revision-id: ian.clatworthy at canonical.com-20090118013701-ogz42t2c8611fwx4
        parent: ian.clatworthy at canonical.com-20090118005224-rkr66k4s31mgwy0z
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-show-diff
        timestamp: Sun 2009-01-18 11:37:01 +1000
        message:
          hand control of diff formatting to the log formatter
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3943.5.1
        revision-id: ian.clatworthy at canonical.com-20090118005224-rkr66k4s31mgwy0z
        parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.log-show-diff
        timestamp: Sun 2009-01-18 10:52:24 +1000
        message:
          first cut at log --show-diff
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
    ------------------------------------------------------------
    revno: 3955.1.9
    revision-id: pqm at pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
    parent: pqm at pqm.ubuntu.com-20090127184345-wkncpsyxov2citpy
    parent: john at arbash-meinel.com-20090126205756-wh552ozttirfo2m9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2009-01-27 20:24:43 +0000
    message:
      (jam) Avoid getting a UserWarning by not creating an unused progress
      	bar.
    modified:
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
        ------------------------------------------------------------
        revno: 3955.8.1
        revision-id: john at arbash-meinel.com-20090126205756-wh552ozttirfo2m9
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.12-progress-warnings
        timestamp: Mon 2009-01-26 14:57:56 -0600
        message:
          There is no need to create a progress bar that we don't even use.
        modified:
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
    ------------------------------------------------------------
    revno: 3955.1.8
    revision-id: pqm at pqm.ubuntu.com-20090127184345-wkncpsyxov2citpy
    parent: pqm at pqm.ubuntu.com-20090127175532-221guyk1hom2fzli
    parent: v.ladeuil+lp at free.fr-20090127180557-m8lzcymb344dtwo3
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2009-01-27 18:43:45 +0000
    message:
      (vila) Fix bug #314525: don't try to put ids if there is no annotation
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
        ------------------------------------------------------------
        revno: 3955.7.2
        revision-id: v.ladeuil+lp at free.fr-20090127180557-m8lzcymb344dtwo3
        parent: v.ladeuil+lp at free.fr-20090127173602-c4r1ua3w7rz1ypgz
        parent: v.ladeuil+lp at free.fr-20090127180500-bv6vc33v59hpphti
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr.integration
        timestamp: Tue 2009-01-27 19:05:57 +0100
        message:
          Fix bug #314525: don't try to put ids if there is no annotation (second try)
        modified:
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
            ------------------------------------------------------------
            revno: 3955.6.3
            revision-id: v.ladeuil+lp at free.fr-20090127180500-bv6vc33v59hpphti
            parent: v.ladeuil+lp at free.fr-20090127173234-ksrb3hxbpdo8traf
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: 314525-annotate-show-ids
            timestamp: Tue 2009-01-27 19:05:00 +0100
            message:
              Damn gremlin.
              
              * bzrlib/annotate.py:
              (_show_id_annotations): Gremlin modification reverted.
            modified:
              bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
        ------------------------------------------------------------
        revno: 3955.7.1
        revision-id: v.ladeuil+lp at free.fr-20090127173602-c4r1ua3w7rz1ypgz
        parent: pqm at pqm.ubuntu.com-20090127171757-9pgye6upofwicmsc
        parent: v.ladeuil+lp at free.fr-20090127173234-ksrb3hxbpdo8traf
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr.integration
        timestamp: Tue 2009-01-27 18:36:02 +0100
        message:
          Fix bug #314525: don't try to put ids if there is no annotation
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
        ------------------------------------------------------------
        revno: 3955.6.2
        revision-id: v.ladeuil+lp at free.fr-20090127173234-ksrb3hxbpdo8traf
        parent: v.ladeuil+lp at free.fr-20090127103538-ogm13br9j6j98qzg
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 314525-annotate-show-ids
        timestamp: Tue 2009-01-27 18:32:34 +0100
        message:
          Don't outsmart original author !
          
          * bzrlib/annotate.py:
          (_show_id_annotations): Revert to Anne's way since jam agrees with
          her :)
        modified:
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
        ------------------------------------------------------------
        revno: 3955.6.1
        revision-id: v.ladeuil+lp at free.fr-20090127103538-ogm13br9j6j98qzg
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 314525-annotate-show-ids
        timestamp: Tue 2009-01-27 11:35:38 +0100
        message:
          Fix bug #314525: don't try to put ids if there is no annotation.
          
          * bzrlib/tests/blackbox/test_annotate.py:
          (TestSimpleAnnotate.test_annotate_empty_file_show_ids): Reproduce
          bug #314525.
          
          * bzrlib/annotate.py:
          (_show_id_annotations): Shortcut if the file is
          empty (i.e. without annotations there is no place to put the
          ids).
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
    ------------------------------------------------------------
    revno: 3955.1.7
    revision-id: pqm at pqm.ubuntu.com-20090127175532-221guyk1hom2fzli
    parent: pqm at pqm.ubuntu.com-20090127171757-9pgye6upofwicmsc
    parent: john at arbash-meinel.com-20090127161617-paqmej2501xnuktf
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2009-01-27 17:55:32 +0000
    message:
      (jml) Refactor 'cmd_serve' to make it easier to extend.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
      bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
        ------------------------------------------------------------
        revno: 3955.5.8
        revision-id: john at arbash-meinel.com-20090127161617-paqmej2501xnuktf
        parent: jml at canonical.com-20090123224833-cqsppcpqokk84wu3
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2009-01-27 10:16:17 -0600
        message:
          Merge bzr.dev 3960, resolve NEWS
        added:
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3955.5.7
        revision-id: jml at canonical.com-20090123224833-cqsppcpqokk84wu3
        parent: jml at canonical.com-20090123223622-vx2zuxzgebj0p30r
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 20:48:33 -0200
        message:
          Fix some tests that assumed the port was on stderr rather than stdout.
        modified:
          bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
        ------------------------------------------------------------
        revno: 3955.5.6
        revision-id: jml at canonical.com-20090123223622-vx2zuxzgebj0p30r
        parent: jml at canonical.com-20090123215439-mjdg4g3bzrt0db1r
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 20:36:22 -0200
        message:
          Fix up a couple of dumb errors.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3955.5.5
        revision-id: jml at canonical.com-20090123215439-mjdg4g3bzrt0db1r
        parent: jml at canonical.com-20090123215216-561di9mu3dtysuft
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 19:54:39 -0200
        message:
          NEWS update and copyright update.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3955.5.4
        revision-id: jml at canonical.com-20090123215216-561di9mu3dtysuft
        parent: jml at canonical.com-20090123214639-mpgyfh5pmh3gom2a
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 19:52:16 -0200
        message:
          Docstrings and extraction of method to get the smart server.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3955.5.3
        revision-id: jml at canonical.com-20090123214639-mpgyfh5pmh3gom2a
        parent: jml at canonical.com-20090123214506-l7ck1ykttxhjjk9i
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 19:46:39 -0200
        message:
          Rename run_server to run_smart_server.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3955.5.2
        revision-id: jml at canonical.com-20090123214506-l7ck1ykttxhjjk9i
        parent: jml at canonical.com-20090123213217-2f2rt7abpv816zan
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 19:45:06 -0200
        message:
          Extract the port-getting logic. Use note() rather than print()
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3955.5.1
        revision-id: jml at canonical.com-20090123213217-2f2rt7abpv816zan
        parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: refactor-serve
        timestamp: Fri 2009-01-23 19:32:17 -0200
        message:
          Extract the bit of run() that runs the server.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3955.1.6
    revision-id: pqm at pqm.ubuntu.com-20090127171757-9pgye6upofwicmsc
    parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
    parent: jelmer at samba.org-20090127161613-yt5stpfwpoploujc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2009-01-27 17:17:57 +0000
    message:
      (Jelmer) Implement
      	VirtualVersionedFiles.iter_lines_added_or_present_in_keys().
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3949.4.2
        revision-id: jelmer at samba.org-20090127161613-yt5stpfwpoploujc
        parent: jelmer at samba.org-20090122010344-axad8n0ht98ajbgh
        parent: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: vf-iter_lines
        timestamp: Tue 2009-01-27 17:16:13 +0100
        message:
          Merge bzr.dev.
        added:
          bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
          bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3949.4.1
        revision-id: jelmer at samba.org-20090122010344-axad8n0ht98ajbgh
        parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Thu 2009-01-22 02:03:44 +0100
        message:
          Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3955.1.5
    revision-id: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
    parent: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
    parent: mbp at sourcefrog.net-20090126170421-dypt01en9zx8y16o
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-01-26 18:12:48 +0000
    message:
      (mbp) Merge back 1.11final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3955.4.1
        revision-id: mbp at sourcefrog.net-20090126170421-dypt01en9zx8y16o
        parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
        parent: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: integration
        timestamp: Mon 2009-01-26 15:04:21 -0200
        message:
          Merge back 1.11final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3932.2.7
        revision-id: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
        parent: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.11
        timestamp: Mon 2009-01-19 22:33:38 +1100
        message:
          Prepare 1.11final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3932.2.6
        revision-id: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
        parent: mbp at sourcefrog.net-20090115073758-1wmwy7kvgh7hxnh4
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.11
        timestamp: Thu 2009-01-15 18:40:41 +1100
        message:
          Update news
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3932.2.5
        revision-id: mbp at sourcefrog.net-20090115073758-1wmwy7kvgh7hxnh4
        parent: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
        parent: pqm at pqm.ubuntu.com-20090110235923-dibvaa8suy8gk1ef
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.11
        timestamp: Thu 2009-01-15 18:37:58 +1100
        message:
          Fix failing test when CompiledChunksToLines is not available.
        modified:
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 3932.2.4
        revision-id: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
        parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
        parent: john at arbash-meinel.com-20090114193109-sramygcktbcz589f
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.11
        timestamp: Wed 2009-01-14 23:03:46 +0000
        message:
          (jam) Update stacking code so stacked branches don't open multiple
          	connections.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
        ------------------------------------------------------------
        revno: 3928.3.5
        revision-id: john at arbash-meinel.com-20090114193109-sramygcktbcz589f
        parent: john at arbash-meinel.com-20090109031355-rg3grll5bbshstf2
        parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: stacking_tweaks
        timestamp: Wed 2009-01-14 13:31:09 -0600
        message:
          Merge in bzr.1.11, resolve NEWS
        added:
          bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
          bzrlib/tests/https_server.py   https_server.py-20071121173708-aj8zczi0ziwbwz21-1
          bzrlib/tests/ssl_certs/        ssl_certs-20071124141654-dc9za9nho2gmzbri-1
          bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
          bzrlib/tests/ssl_certs/ca.crt  ca.crt-20071124141703-j5hr254lm287lyut-7
          bzrlib/tests/ssl_certs/ca.key  ca.key-20071124141703-j5hr254lm287lyut-6
          bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
          bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
          bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
          bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
          bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
          doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 3955.1.4
    revision-id: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
    parent: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
    parent: mbp at sourcefrog.net-20090124151523-fb5fbarjmbqcygd7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2009-01-26 11:59:28 +0000
    message:
      (mbp) improved plugin developer documentation
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
      doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.9
        revision-id: mbp at sourcefrog.net-20090124151523-fb5fbarjmbqcygd7
        parent: mbp at sourcefrog.net-20090123223931-kb1la553lxibnbpd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Sat 2009-01-24 13:15:23 -0200
        message:
          News entry about plugin docs
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3939.1.8
        revision-id: mbp at sourcefrog.net-20090123223931-kb1la553lxibnbpd
        parent: mbp at sourcefrog.net-20090123200435-umq1l6xoepcvgw0c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 20:39:31 -0200
        message:
          Rephrase api docs
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.7
        revision-id: mbp at sourcefrog.net-20090123200435-umq1l6xoepcvgw0c
        parent: mbp at sourcefrog.net-20090123185245-mjqgjwrw4py3a3kb
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 18:04:35 -0200
        message:
          Suggest looking at __name__ in plugins
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.6
        revision-id: mbp at sourcefrog.net-20090123185245-mjqgjwrw4py3a3kb
        parent: mbp at sourcefrog.net-20090123184533-8p7762lg1jh5cwli
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:52:45 -0200
        message:
          Correction to how plugins advertise their version
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.5
        revision-id: mbp at sourcefrog.net-20090123184533-8p7762lg1jh5cwli
        parent: mbp at sourcefrog.net-20090123184410-8no3skbgeghur5jh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:45:33 -0200
        message:
          Suggestions how to publish plugins
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.4
        revision-id: mbp at sourcefrog.net-20090123184410-8no3skbgeghur5jh
        parent: mbp at sourcefrog.net-20090123181344-z40j1j2zjwn4vswy
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:44:10 -0200
        message:
          More documentation and links about writing plugins
        modified:
          doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.3
        revision-id: mbp at sourcefrog.net-20090123181344-z40j1j2zjwn4vswy
        parent: mbp at sourcefrog.net-20090123175030-etahwt2dg0lqdcel
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 16:13:44 -0200
        message:
          More plugin api docs
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3939.1.2
        revision-id: mbp at sourcefrog.net-20090123175030-etahwt2dg0lqdcel
        parent: mbp at sourcefrog.net-20090115075305-lu6m9n2gzl432lh0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2009-01-23 15:50:30 -0200
        message:
          Mention plugin docstrings and give a short example of the api requirement function
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
    ------------------------------------------------------------
    revno: 3955.1.3
    revision-id: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
    parent: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
    parent: john at arbash-meinel.com-20090123212239-kbt36lwczrha6q67
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2009-01-24 18:50:51 +0000
    message:
      (jam) Add Transport._report_activity support to HTTP transports.
    modified:
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3955.3.2
        revision-id: john at arbash-meinel.com-20090123212239-kbt36lwczrha6q67
        parent: john at arbash-meinel.com-20090123212055-qsa1szqtrrxtwgdl
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.12-network-io
        timestamp: Fri 2009-01-23 15:22:39 -0600
        message:
          Start using report_activity for HTTP (pycurl + urllib)
        modified:
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
        ------------------------------------------------------------
        revno: 3955.3.1
        revision-id: john at arbash-meinel.com-20090123212055-qsa1szqtrrxtwgdl
        parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.12-network-io
        timestamp: Fri 2009-01-23 15:20:55 -0600
        message:
          Add report_activity to osutils.pumpfile
        modified:
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    revno: 3955.1.2
    revision-id: pqm at pqm.ubuntu.com-20090124044940-7j90kl1qq22la0rx
    parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
    parent: ian.clatworthy at canonical.com-20090124040308-m6u33ditaksvwrrq
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2009-01-24 04:49:40 +0000
    message:
      Branch.iter_merge_sorted_revisions API (Ian Clatworthy)
    added:
      bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
        ------------------------------------------------------------
        revno: 3955.2.1
        revision-id: ian.clatworthy at canonical.com-20090124040308-m6u33ditaksvwrrq
        parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
        parent: ian.clatworthy at canonical.com-20090124035735-r7joe4qxqj0wsp9r
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Sat 2009-01-24 14:03:08 +1000
        message:
          Branch.iter_merge_sorted_revisions API (Ian Clatworthy)
        added:
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
        ------------------------------------------------------------
        revno: 3949.3.8
        revision-id: ian.clatworthy at canonical.com-20090124035735-r7joe4qxqj0wsp9r
        parent: ian.clatworthy at canonical.com-20090124014858-t8snms0c708b22cj
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 13:57:35 +1000
        message:
          feedback from poolie
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3949.3.7
        revision-id: ian.clatworthy at canonical.com-20090124014858-t8snms0c708b22cj
        parent: ian.clatworthy at canonical.com-20090124001510-1zy4ycf7et22tq5d
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 11:48:58 +1000
        message:
          drop seqnum from in-memory cache
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3949.3.6
        revision-id: ian.clatworthy at canonical.com-20090124001510-1zy4ycf7et22tq5d
        parent: ian.clatworthy at canonical.com-20090123212235-e9rkelh590rcdmbb
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 10:15:10 +1000
        message:
          feedback from beuno
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3949.3.5
        revision-id: ian.clatworthy at canonical.com-20090123212235-e9rkelh590rcdmbb
        parent: ian.clatworthy at canonical.com-20090123211924-am3uaq95d1ebsfcq
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 07:22:35 +1000
        message:
          NEWS tweak
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3949.3.4
        revision-id: ian.clatworthy at canonical.com-20090123211924-am3uaq95d1ebsfcq
        parent: ian.clatworthy at canonical.com-20090122123241-bv173v5plq0f3s4k
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Sat 2009-01-24 07:19:24 +1000
        message:
          jam feedback: start & stop limits; simple caching
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3949.3.3
        revision-id: ian.clatworthy at canonical.com-20090122123241-bv173v5plq0f3s4k
        parent: ian.clatworthy at canonical.com-20090121030800-q0epxz7r2wq9wklb
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Thu 2009-01-22 22:32:41 +1000
        message:
          simplify the meaning of forward to be appropriate to this layer
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3949.3.2
        revision-id: ian.clatworthy at canonical.com-20090121030800-q0epxz7r2wq9wklb
        parent: ian.clatworthy at canonical.com-20090121005320-o96d2epcbtd6z331
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Wed 2009-01-21 13:08:00 +1000
        message:
          feedback from jam
        renamed:
          bzrlib/tests/branch_implementations/test_merge_sorted_revisions.py => bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        ------------------------------------------------------------
        revno: 3949.3.1
        revision-id: ian.clatworthy at canonical.com-20090121005320-o96d2epcbtd6z331
        parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.merge_sorted_revisions
        timestamp: Wed 2009-01-21 10:53:20 +1000
        message:
          introduce Branch.merge_sorted_revisions API
        added:
          bzrlib/tests/branch_implementations/test_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
    ------------------------------------------------------------
    revno: 3955.1.1
    revision-id: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
    parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
    parent: mbp at sourcefrog.net-20090123172552-uu2eh59t0azzvcq9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2009-01-23 18:14:16 +0000
    message:
      (mbp) further progress bar fixes
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.8
    revision-id: mbp at sourcefrog.net-20090123172552-uu2eh59t0azzvcq9
    parent: mbp at sourcefrog.net-20090122214649-awlvm833pao0t1wp
    parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Fri 2009-01-23 15:25:52 -0200
    message:
      merge trunk
    added:
      bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
      bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
    ------------------------------------------------------------
    revno: 3948.2.7
    revision-id: mbp at sourcefrog.net-20090122214649-awlvm833pao0t1wp
    parent: mbp at sourcefrog.net-20090121060117-4c3xrje8jahq70uu
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Thu 2009-01-22 19:46:49 -0200
    message:
      pep8
    modified:
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
    ------------------------------------------------------------
    revno: 3948.2.6
    revision-id: mbp at sourcefrog.net-20090121060117-4c3xrje8jahq70uu
    parent: mbp at sourcefrog.net-20090121054918-174smoskf8srdm41
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 04:01:17 -0200
    message:
      ProgressBarStack is deprecated
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
    ------------------------------------------------------------
    revno: 3948.2.5
    revision-id: mbp at sourcefrog.net-20090121054918-174smoskf8srdm41
    parent: mbp at sourcefrog.net-20090121054258-cyngfg4gdv4tmqm1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:49:18 -0200
    message:
      rename to _progress_all_finished
    modified:
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.4
    revision-id: mbp at sourcefrog.net-20090121054258-cyngfg4gdv4tmqm1
    parent: mbp at sourcefrog.net-20090121053816-b2eua3hvawjhguzk
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:42:58 -0200
    message:
      Remove some obsolete progress docstring
    modified:
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
    ------------------------------------------------------------
    revno: 3948.2.3
    revision-id: mbp at sourcefrog.net-20090121053816-b2eua3hvawjhguzk
    parent: mbp at sourcefrog.net-20090121053044-mhynfsubozjh9wol
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:38:16 -0200
    message:
      Make the interface from ProgressTask to ui more private
    modified:
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.2
    revision-id: mbp at sourcefrog.net-20090121053044-mhynfsubozjh9wol
    parent: mbp at sourcefrog.net-20090121050132-8j59ox99p84hiz51
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:30:44 -0200
    message:
      Corrections to finishing progress bars
    modified:
      bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
    ------------------------------------------------------------
    revno: 3948.2.1
    revision-id: mbp at sourcefrog.net-20090121050132-8j59ox99p84hiz51
    parent: pqm at pqm.ubuntu.com-20090120044335-pwr2rshr1yu6vzti
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: progress
    timestamp: Wed 2009-01-21 03:01:32 -0200
    message:
      Add ProgressTask repr
    modified:
      bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
-------------- next part --------------

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


More information about the bazaar-commits mailing list