Rev 3390: Merge bzr.dev, fixing minor skew. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

Robert Collins robertc at robertcollins.net
Tue Jul 1 04:39:07 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

------------------------------------------------------------
revno: 3390
revision-id: robertc at robertcollins.net-20080701033835-dwbt0f0x3vmf5atr
parent: robertc at robertcollins.net-20080625012948-aclmfg49kaf8zdv8
parent: pqm at pqm.ubuntu.com-20080630055535-42tx43kb228k4p94
committer: Robert Collins <robertc at robertcollins.net>
branch nick: stacking-knits
timestamp: Tue 2008-07-01 13:38:35 +1000
message:
  Merge bzr.dev, fixing minor skew.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
  bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  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/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/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  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_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
  bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
  bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
  bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
  bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 3350.2.164
    revision-id: pqm at pqm.ubuntu.com-20080630055535-42tx43kb228k4p94
    parent: pqm at pqm.ubuntu.com-20080627225315-j2xpbsvjyya1s97y
    parent: aaron at aaronbentley.com-20080630052747-p93i1jak2l2vg48x
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-06-30 06:55:35 +0100
    message:
      Implement aliases for remembered locations (abentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
        ------------------------------------------------------------
        revno: 3350.173.4
        revision-id: aaron at aaronbentley.com-20080630052747-p93i1jak2l2vg48x
        parent: aaron at aaronbentley.com-20080626060649-ntrr0jfchizpbkfm
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: alias.lookup
        timestamp: Mon 2008-06-30 01:27:47 -0400
        message:
          Fix spacing
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
        ------------------------------------------------------------
        revno: 3350.173.3
        revision-id: aaron at aaronbentley.com-20080626060649-ntrr0jfchizpbkfm
        parent: aaron at aaronbentley.com-20080626060336-jawagd0ir0l6gurr
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: alias.lookup
        timestamp: Thu 2008-06-26 02:06:49 -0400
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3350.173.2
        revision-id: aaron at aaronbentley.com-20080626060336-jawagd0ir0l6gurr
        parent: aaron at aaronbentley.com-20080626051031-ylyzlwa3t41dd3it
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: alias.lookup
        timestamp: Thu 2008-06-26 02:03:36 -0400
        message:
          Add :push and :this
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
        ------------------------------------------------------------
        revno: 3350.173.1
        revision-id: aaron at aaronbentley.com-20080626051031-ylyzlwa3t41dd3it
        parent: pqm at pqm.ubuntu.com-20080626004245-dnw85so4xqg8r9hy
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: alias.lookup
        timestamp: Thu 2008-06-26 01:10:31 -0400
        message:
          Add support for branch-associated locations
        modified:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
    ------------------------------------------------------------
    revno: 3350.2.163
    revision-id: pqm at pqm.ubuntu.com-20080627225315-j2xpbsvjyya1s97y
    parent: pqm at pqm.ubuntu.com-20080626004245-dnw85so4xqg8r9hy
    parent: v.ladeuil+lp at free.fr-20080627222740-9rat5vruay26xyac
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-06-27 23:53:15 +0100
    message:
      Fix ftp transport so that it handles the 'mode' parameter when
      	provided
    modified:
      bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
        ------------------------------------------------------------
        revno: 3350.172.1
        revision-id: v.ladeuil+lp at free.fr-20080627222740-9rat5vruay26xyac
        parent: pqm at pqm.ubuntu.com-20080626004245-dnw85so4xqg8r9hy
        parent: v.ladeuil+lp at free.fr-20080627215743-80k2knfo81vrsc8z
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: trunk
        timestamp: Sat 2008-06-28 00:27:40 +0200
        message:
          Fix ftp transport so that it handles the mode parameter when provided
        modified:
          bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
        ------------------------------------------------------------
        revno: 3350.171.2
        revision-id: v.ladeuil+lp at free.fr-20080627215743-80k2knfo81vrsc8z
        parent: v.ladeuil+lp at free.fr-20080627172606-zn1z2ekknau3qa3c
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: fix-chmod
        timestamp: Fri 2008-06-27 23:57:43 +0200
        message:
          Fixed as per John's review.
        modified:
          bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
        ------------------------------------------------------------
        revno: 3350.171.1
        revision-id: v.ladeuil+lp at free.fr-20080627172606-zn1z2ekknau3qa3c
        parent: pqm at pqm.ubuntu.com-20080624011313-cq85foncf9mozmen
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: fix-chmod
        timestamp: Fri 2008-06-27 19:26:06 +0200
        message:
          Fix ftp transport so that it handles the 'mode' parameter when provided.
          
          * ftp.py:
          (FtpTransport.put_file, FtpTransport.mkdir,
          FtpTransport._try_append): Use _setmode.
          (FtpTransport._setmode): Fix implementation (parameters were
          reversed and mode not converted).
          
          * ftp_server.py:
          (test_filesystem): New filesystem implementing chmod.
          (test_authorizer.authorize): Use our filesystem when authorized.
          (ftp_channel.cmd_site): Implement SITE CHOWN.
        modified:
          bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 3350.2.162
    revision-id: pqm at pqm.ubuntu.com-20080626004245-dnw85so4xqg8r9hy
    parent: pqm at pqm.ubuntu.com-20080625230724-lyux37pu8nx8tq34
    parent: aaron at aaronbentley.com-20080626001706-wo3w74fwgliy12s4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-06-26 01:42:45 +0100
    message:
      (bialix) Deprectate (Branch|Repository).print_file, fix cmd_cat
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3350.170.2
        revision-id: aaron at aaronbentley.com-20080626001706-wo3w74fwgliy12s4
        parent: aaron at aaronbentley.com-20080626001355-gzj1nnjzlo6z6rrd
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Wed 2008-06-25 20:17:06 -0400
        message:
          Update text and deprecation symbols.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3350.170.1
        revision-id: aaron at aaronbentley.com-20080626001355-gzj1nnjzlo6z6rrd
        parent: pqm at pqm.ubuntu.com-20080625230724-lyux37pu8nx8tq34
        parent: bialix at ukr.net-20080407074946-wlhszbw47p45rjof
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Wed 2008-06-25 20:13:55 -0400
        message:
          Merge cat fixes
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3341.2.2
        revision-id: bialix at ukr.net-20080407074946-wlhszbw47p45rjof
        parent: bialix at ukr.net-20080407074826-5lwuyv4dn1qlijg4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: cmd-cat
        timestamp: Mon 2008-04-07 10:49:46 +0300
        message:
          Tree.print_file and Repository.print_file are deprecated.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3341.2.1
        revision-id: bialix at ukr.net-20080407074826-5lwuyv4dn1qlijg4
        parent: pqm at pqm.ubuntu.com-20080407044456-s1a9orh0kssphdh9
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: cmd-cat
        timestamp: Mon 2008-04-07 10:48:26 +0300
        message:
          `bzr cat` no more internally used Tree.print_file().
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3350.2.161
    revision-id: pqm at pqm.ubuntu.com-20080625230724-lyux37pu8nx8tq34
    parent: pqm at pqm.ubuntu.com-20080625103636-6kxh4e1gmyn82f50
    parent: andrew.bennetts at canonical.com-20080625224023-o0uifuw9r14zbqcp
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-06-26 00:07:24 +0100
    message:
      Add Branch.set_last_revision_ex HPSS verb to accelerate push. (Andrew
      	Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-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
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3350.169.33
        revision-id: andrew.bennetts at canonical.com-20080625224023-o0uifuw9r14zbqcp
        parent: andrew.bennetts at canonical.com-20080625222757-qoxz8w75h89hm6mk
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-26 08:40:23 +1000
        message:
          Add NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3350.169.32
        revision-id: andrew.bennetts at canonical.com-20080625222757-qoxz8w75h89hm6mk
        parent: andrew.bennetts at canonical.com-20080625222421-3awo7n34il23al6e
        parent: pqm at pqm.ubuntu.com-20080625103636-6kxh4e1gmyn82f50
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-26 08:27:57 +1000
        message:
          Merge bzr.dev.
        removed:
          bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
          bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
          bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
          bzrlib/tests/interversionedfile_implementations/ interversionedfile_implementations-20060301230427-f1f3ca8ddd5ff482
          bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/revisionstore_implementations/ revisionstore_implementations-20060303020702-1d2e36b63cef2706
          bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
          bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
          bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
        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/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/store/text.py           text.py-20050928201105-c26468dcb5d9b18b
          bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
          bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          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_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/weave_commands.py       weave_commands.py-20060320231507-8e9f300bffc1aa19
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.169.31
        revision-id: andrew.bennetts at canonical.com-20080625222421-3awo7n34il23al6e
        parent: andrew.bennetts at canonical.com-20080625221943-u2l0bgub812uuxpv
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-26 08:24:21 +1000
        message:
          Add test for allow_diverged flag.
        modified:
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.30
        revision-id: andrew.bennetts at canonical.com-20080625221943-u2l0bgub812uuxpv
        parent: andrew.bennetts at canonical.com-20080625081024-0r93tenthlcg1m22
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-26 08:19:43 +1000
        message:
          Improve tests for all Branch.set_last_revision* verbs.
        modified:
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.29
        revision-id: andrew.bennetts at canonical.com-20080625081024-0r93tenthlcg1m22
        parent: andrew.bennetts at canonical.com-20080625070341-mtvuq1hltikm3axr
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-25 18:10:24 +1000
        message:
          More review tweaks: whitespace nits in test_smart, add (and use) ._clear_cached_state_of_remote_branch_only method in bzrlib/remote.py.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.28
        revision-id: andrew.bennetts at canonical.com-20080625070341-mtvuq1hltikm3axr
        parent: andrew.bennetts at canonical.com-20080625064825-rda4tckbyjtpbasd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-25 17:03:41 +1000
        message:
          Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
        ------------------------------------------------------------
        revno: 3350.169.27
        revision-id: andrew.bennetts at canonical.com-20080625064825-rda4tckbyjtpbasd
        parent: andrew.bennetts at canonical.com-20080625052131-vjkwu35vz03rbxfx
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-25 16:48:25 +1000
        message:
          Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.169.26
        revision-id: andrew.bennetts at canonical.com-20080625052131-vjkwu35vz03rbxfx
        parent: andrew.bennetts at canonical.com-20080619025112-wf4jpdp25lqk422y
        parent: andrew.bennetts at canonical.com-20080624225843-8e4tdnekeltv4g1j
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-25 15:21:31 +1000
        message:
          Merge old-hpss-branch-implementation-test.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.169.25
        revision-id: andrew.bennetts at canonical.com-20080619025112-wf4jpdp25lqk422y
        parent: andrew.bennetts at canonical.com-20080619010305-3pudocqfsszeapgr
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-19 12:51:12 +1000
        message:
          Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex.  It's a cop out, but at least it's not misleading.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.24
        revision-id: andrew.bennetts at canonical.com-20080619010305-3pudocqfsszeapgr
        parent: andrew.bennetts at canonical.com-20080618074641-gletfspa4l47yq6q
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-19 11:03:05 +1000
        message:
          Remove RemoteGraph experiment.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-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: 3350.169.23
        revision-id: andrew.bennetts at canonical.com-20080618074641-gletfspa4l47yq6q
        parent: andrew.bennetts at canonical.com-20080618072115-ig9jwupw1yeu8iey
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-18 17:46:41 +1000
        message:
          Fix test failures.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.22
        revision-id: andrew.bennetts at canonical.com-20080618072115-ig9jwupw1yeu8iey
        parent: andrew.bennetts at canonical.com-20080612000214-hc6p2gyvvatrq78d
        parent: andrew.bennetts at canonical.com-20080618070236-x1eavwimpg8y4tff
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-18 17:21:15 +1000
        message:
          Merge from old-hpss-branch-implementation-test.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
          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/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
          bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3350.169.21
        revision-id: andrew.bennetts at canonical.com-20080612000214-hc6p2gyvvatrq78d
        parent: andrew.bennetts at canonical.com-20080611110514-yvj911cxzglska8k
        parent: andrew.bennetts at canonical.com-20080612000058-akw5xzm3hmqqg814
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-06-12 10:02:14 +1000
        message:
          Merge from old-hpss-branch-implementation-test
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
        ------------------------------------------------------------
        revno: 3350.169.20
        revision-id: andrew.bennetts at canonical.com-20080611110514-yvj911cxzglska8k
        parent: andrew.bennetts at canonical.com-20080611075800-dy5i13vfxf7klxt2
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-11 21:05:14 +1000
        message:
          Fix failing test by adding @needs_write_lock to RemoteBranch.last_revision_info, because it uses _last_revision_info_cache.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.169.19
        revision-id: andrew.bennetts at canonical.com-20080611075800-dy5i13vfxf7klxt2
        parent: andrew.bennetts at canonical.com-20080610085630-w1wcd9p18n0nr5na
        parent: andrew.bennetts at canonical.com-20080611075635-asua1e59xzsxg4te
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-11 17:58:00 +1000
        message:
          Merge from old-hpss-branch-implementation-test.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
          bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
        ------------------------------------------------------------
        revno: 3350.169.18
        revision-id: andrew.bennetts at canonical.com-20080610085630-w1wcd9p18n0nr5na
        parent: andrew.bennetts at canonical.com-20080610075651-buomfp69nu97yw3m
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Tue 2008-06-10 18:56:30 +1000
        message:
          Fix some test failures.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
        ------------------------------------------------------------
        revno: 3350.169.17
        revision-id: andrew.bennetts at canonical.com-20080610075651-buomfp69nu97yw3m
        parent: andrew.bennetts at canonical.com-20080605230514-curu8h29adujufi2
        parent: andrew.bennetts at canonical.com-20080610075420-sjzf37kdpxcbra0d
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Tue 2008-06-10 17:56:51 +1000
        message:
          Merge old-hpss-branch-implementation-test.
        added:
          bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
          bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
          bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
          bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
          bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
          bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
          bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
          bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
        renamed:
          doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
          bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        ------------------------------------------------------------
        revno: 3350.169.16
        revision-id: andrew.bennetts at canonical.com-20080605230514-curu8h29adujufi2
        parent: andrew.bennetts at canonical.com-20080604064528-q7ie26uexe09pvgd
        parent: andrew.bennetts at canonical.com-20080605230341-33kb0jzhn8wi3glg
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Fri 2008-06-06 09:05:14 +1000
        message:
          Merge from old-hpss-branch-implementation-test.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_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/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.169.15
        revision-id: andrew.bennetts at canonical.com-20080604064528-q7ie26uexe09pvgd
        parent: andrew.bennetts at canonical.com-20080604064433-xtm2hi90ef1igt1v
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-04 16:45:28 +1000
        message:
          Remove obsolete comment.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.169.14
        revision-id: andrew.bennetts at canonical.com-20080604064433-xtm2hi90ef1igt1v
        parent: andrew.bennetts at canonical.com-20080604064054-jt6f7bsc220rgrur
        parent: pqm at pqm.ubuntu.com-20080603072242-omtkkk586pc5k4d4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-04 16:44:33 +1000
        message:
          Merge from bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          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/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          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_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
          bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
          bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
          doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
          doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
          doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
        ------------------------------------------------------------
        revno: 3350.169.13
        revision-id: andrew.bennetts at canonical.com-20080604064054-jt6f7bsc220rgrur
        parent: andrew.bennetts at canonical.com-20080529065747-dmdm81xjibjz0bho
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-06-04 16:40:54 +1000
        message:
          Remove unnecessary extra lock_write in _basic_push.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3350.169.12
        revision-id: andrew.bennetts at canonical.com-20080529065747-dmdm81xjibjz0bho
        parent: andrew.bennetts at canonical.com-20080529065015-3ha2jwaf5ft73ey4
        parent: andrew.bennetts at canonical.com-20080529065132-rbfcrtmrbdgmqass
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-29 16:57:47 +1000
        message:
          Merge from remote-is-at-least.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
        ------------------------------------------------------------
        revno: 3350.169.11
        revision-id: andrew.bennetts at canonical.com-20080529065015-3ha2jwaf5ft73ey4
        parent: andrew.bennetts at canonical.com-20080527011352-is7v01kyo3yhh8sl
        parent: pqm at pqm.ubuntu.com-20080527013230-8qjaju10duxpy3e2
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-29 16:50:15 +1000
        message:
          Merge from bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/transport/fakenfs.py    fakenfs.py-20060402223312-0e29c7275aa384dd
        ------------------------------------------------------------
        revno: 3350.169.10
        revision-id: andrew.bennetts at canonical.com-20080527011352-is7v01kyo3yhh8sl
        parent: andrew.bennetts at canonical.com-20080522090535-gbzz7xj1t7piw1md
        parent: pqm at pqm.ubuntu.com-20080524120232-22xdromy706t0x16
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Tue 2008-05-27 11:13:52 +1000
        message:
          Merge from bzr.dev.
        added:
          bzrlib/tests/file_utils.py     file_utils.py-20080506145406-a1h3ydg2lsh2iriy-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          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/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
          bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
          bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
          bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
        ------------------------------------------------------------
        revno: 3350.169.9
        revision-id: andrew.bennetts at canonical.com-20080522090535-gbzz7xj1t7piw1md
        parent: andrew.bennetts at canonical.com-20080522083634-ysa1m4321kaqwx3c
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-22 19:05:35 +1000
        message:
          Simplify _basic_push.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3350.169.8
        revision-id: andrew.bennetts at canonical.com-20080522083634-ysa1m4321kaqwx3c
        parent: andrew.bennetts at canonical.com-20080522082353-0x2qqjcdtlkeg88f
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-22 18:36:34 +1000
        message:
          Fix pushing a diverged branch with --overwrite via HPSS.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3350.169.7
        revision-id: andrew.bennetts at canonical.com-20080522082353-0x2qqjcdtlkeg88f
        parent: andrew.bennetts at canonical.com-20080522074906-dcdk44d7y8cdn4no
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-22 18:23:53 +1000
        message:
          Fix unbound global.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.169.6
        revision-id: andrew.bennetts at canonical.com-20080522074906-dcdk44d7y8cdn4no
        parent: andrew.bennetts at canonical.com-20080522055850-um0u9dj5jpkptkuq
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-22 17:49:06 +1000
        message:
          Greatly simplify RemoteBranch.update_revisions.  Still needs more tests.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.5
        revision-id: andrew.bennetts at canonical.com-20080522055850-um0u9dj5jpkptkuq
        parent: andrew.bennetts at canonical.com-20080522052046-jf4hroxln68v7pfn
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-22 15:58:50 +1000
        message:
          Some small tweaks and comments.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3350.169.4
        revision-id: andrew.bennetts at canonical.com-20080522052046-jf4hroxln68v7pfn
        parent: andrew.bennetts at canonical.com-20080521115809-6cw3t8gn4qm0bpg9
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Thu 2008-05-22 15:20:46 +1000
        message:
          Fix test failures, and add some tests for the remote graph heads RPC.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3350.169.3
        revision-id: andrew.bennetts at canonical.com-20080521115809-6cw3t8gn4qm0bpg9
        parent: andrew.bennetts at canonical.com-20080521115658-31lutjnj93u3dejf
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-05-21 21:58:09 +1000
        message:
          Remove a bit more debugging cruft.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.169.2
        revision-id: andrew.bennetts at canonical.com-20080521115658-31lutjnj93u3dejf
        parent: andrew.bennetts at canonical.com-20080521115344-oofrx0k7yht4564t
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-05-21 21:56:58 +1000
        message:
          Remove various debugging cruft.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.169.1
        revision-id: andrew.bennetts at canonical.com-20080521115344-oofrx0k7yht4564t
        parent: andrew.bennetts at canonical.com-20080521024958-1b79jyuv3v9qhuq3
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: smart-push-gpm
        timestamp: Wed 2008-05-21 21:53:44 +1000
        message:
          Avoid necessarily calling get_parent_map when pushing.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 3350.2.160
    revision-id: pqm at pqm.ubuntu.com-20080625103636-6kxh4e1gmyn82f50
    parent: pqm at pqm.ubuntu.com-20080625052120-j14uqsf6jlbg1lbb
    parent: mbp at sourcefrog.net-20080625100648-ac20jxcm3ojucuby
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-25 11:36:36 +0100
    message:
      (mbp for robertc) VersionedFiles refactoring
    removed:
      bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
      bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
      bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
      bzrlib/tests/interversionedfile_implementations/ interversionedfile_implementations-20060301230427-f1f3ca8ddd5ff482
      bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
      bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
      bzrlib/tests/revisionstore_implementations/ revisionstore_implementations-20060303020702-1d2e36b63cef2706
      bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
      bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
      bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
    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/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
      bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
      bzrlib/store/text.py           text.py-20050928201105-c26468dcb5d9b18b
      bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
      bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
      bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
      bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
      bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
      bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
      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_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
      bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
      bzrlib/weave_commands.py       weave_commands.py-20060320231507-8e9f300bffc1aa19
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3377.1.6
        revision-id: mbp at sourcefrog.net-20080625100648-ac20jxcm3ojucuby
        parent: mbp at sourcefrog.net-20080624030443-fybxf5apkwv58oyp
        parent: pqm at pqm.ubuntu.com-20080625052120-j14uqsf6jlbg1lbb
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: versionedfiles
        timestamp: Wed 2008-06-25 20:06:48 +1000
        message:
          merge trunk; remove RemoteToOtherFetcher
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          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_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
          bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
          bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
          bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3377.1.5
        revision-id: mbp at sourcefrog.net-20080624030443-fybxf5apkwv58oyp
        parent: mbp at sourcefrog.net-20080618075609-zehkroqkqufck2zb
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: versionedfiles
        timestamp: Tue 2008-06-24 13:04:43 +1000
        message:
          Review cleanups and documentation from Robert's mail on 2080618
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3377.1.4
        revision-id: mbp at sourcefrog.net-20080618075609-zehkroqkqufck2zb
        parent: mbp at sourcefrog.net-20080618053757-zlky6vpskl1yd2pz
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: versionedfiles
        timestamp: Wed 2008-06-18 17:56:09 +1000
        message:
          VersionedFiles review cleanups
        modified:
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3377.1.3
        revision-id: mbp at sourcefrog.net-20080618053757-zlky6vpskl1yd2pz
        parent: mbp at sourcefrog.net-20080618053502-9ogi5d5tx7w5ybf6
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: versionedfiles
        timestamp: Wed 2008-06-18 15:37:57 +1000
        message:
          Update NEWS for VersionedFiles changes
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3377.1.2
        revision-id: mbp at sourcefrog.net-20080618053502-9ogi5d5tx7w5ybf6
        parent: robertc at robertcollins.net-20080617050234-knib0hpz6pjx3sl1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: versionedfiles
        timestamp: Wed 2008-06-18 15:35:02 +1000
        message:
          Change stray pdb calls to exceptions
        modified:
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3377.1.1
        revision-id: robertc at robertcollins.net-20080617050234-knib0hpz6pjx3sl1
        parent: robertc at robertcollins.net-20080612032525-hp52uf3wa7546c4u
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: VersionedFiles.add_api
        timestamp: Tue 2008-06-17 15:02:34 +1000
        message:
          Review feedback, making things more clear, adding documentation on what is used where.
        modified:
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          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/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.2.159
    revision-id: pqm at pqm.ubuntu.com-20080625052120-j14uqsf6jlbg1lbb
    parent: pqm at pqm.ubuntu.com-20080624011313-cq85foncf9mozmen
    parent: andrew.bennetts at canonical.com-20080624225843-8e4tdnekeltv4g1j
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-25 06:21:20 +0100
    message:
      Add Remote-v2 variant to branch/repository/bzrdir implementations
      	tests. (Andrew Bennetts)
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
      bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
        ------------------------------------------------------------
        revno: 3350.168.10
        revision-id: andrew.bennetts at canonical.com-20080624225843-8e4tdnekeltv4g1j
        parent: andrew.bennetts at canonical.com-20080624225343-2r1potmqskvij8v2
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Wed 2008-06-25 08:58:43 +1000
        message:
          Fix test failures.
        modified:
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3350.168.9
        revision-id: andrew.bennetts at canonical.com-20080624225343-2r1potmqskvij8v2
        parent: andrew.bennetts at canonical.com-20080618070236-x1eavwimpg8y4tff
        parent: pqm at pqm.ubuntu.com-20080624011313-cq85foncf9mozmen
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Wed 2008-06-25 08:53:43 +1000
        message:
          Merge from bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.168.8
        revision-id: andrew.bennetts at canonical.com-20080618070236-x1eavwimpg8y4tff
        parent: andrew.bennetts at canonical.com-20080618010351-r4bju8oa7m9k8hxz
        parent: pqm at pqm.ubuntu.com-20080618051428-txnglk8ls5jd93fc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Wed 2008-06-18 17:02:36 +1000
        message:
          Merge bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
          bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3350.168.7
        revision-id: andrew.bennetts at canonical.com-20080618010351-r4bju8oa7m9k8hxz
        parent: andrew.bennetts at canonical.com-20080618010118-ox8k0k08bnksnp23
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Wed 2008-06-18 11:03:51 +1000
        message:
          Fix error introduced by merge.
        modified:
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
        ------------------------------------------------------------
        revno: 3350.168.6
        revision-id: andrew.bennetts at canonical.com-20080618010118-ox8k0k08bnksnp23
        parent: andrew.bennetts at canonical.com-20080612000058-akw5xzm3hmqqg814
        parent: andrew.bennetts at canonical.com-20080618005845-3y0ae9qp05d48que
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Wed 2008-06-18 11:01:18 +1000
        message:
          Merge from make-branch-and-tree-fix.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-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/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
        ------------------------------------------------------------
        revno: 3350.168.5
        revision-id: andrew.bennetts at canonical.com-20080612000058-akw5xzm3hmqqg814
        parent: andrew.bennetts at canonical.com-20080611075635-asua1e59xzsxg4te
        parent: andrew.bennetts at canonical.com-20080612000017-rj3iicm3ftpv1fin
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Thu 2008-06-12 10:00:58 +1000
        message:
          Merge from make-branch-and-tree-fix.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
        ------------------------------------------------------------
        revno: 3350.168.4
        revision-id: andrew.bennetts at canonical.com-20080611075635-asua1e59xzsxg4te
        parent: andrew.bennetts at canonical.com-20080610075420-sjzf37kdpxcbra0d
        parent: andrew.bennetts at canonical.com-20080611075454-evxru0ssycsdywgd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Wed 2008-06-11 17:56:35 +1000
        message:
          Merge from make-branch-and-tree-fix.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
          bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
        ------------------------------------------------------------
        revno: 3350.168.3
        revision-id: andrew.bennetts at canonical.com-20080610075420-sjzf37kdpxcbra0d
        parent: andrew.bennetts at canonical.com-20080605230341-33kb0jzhn8wi3glg
        parent: andrew.bennetts at canonical.com-20080610074115-e4isop261jrba6ip
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Tue 2008-06-10 17:54:20 +1000
        message:
          Merge make-branch-and-tree-fix.
        added:
          bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
          bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
          bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
          bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
          bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
          bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
          bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
          bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
        renamed:
          doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
          bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        ------------------------------------------------------------
        revno: 3350.168.2
        revision-id: andrew.bennetts at canonical.com-20080605230341-33kb0jzhn8wi3glg
        parent: andrew.bennetts at canonical.com-20080605225642-0twch8sh5q6h0bw4
        parent: andrew.bennetts at canonical.com-20080605230057-raqbjdzpzvu4emf8
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Fri 2008-06-06 09:03:41 +1000
        message:
          Merge from remote-is-at-least.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.168.1
        revision-id: andrew.bennetts at canonical.com-20080605225642-0twch8sh5q6h0bw4
        parent: andrew.bennetts at canonical.com-20080603224305-qmk0zbwc8kieqlbm
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: old-hpss-branch-implementation-test
        timestamp: Fri 2008-06-06 08:56:42 +1000
        message:
          Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
        modified:
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
    ------------------------------------------------------------
    revno: 3350.2.158
    revision-id: pqm at pqm.ubuntu.com-20080624011313-cq85foncf9mozmen
    parent: pqm at pqm.ubuntu.com-20080623203807-3uudpo6dw8nxhxzz
    parent: andrew.bennetts at canonical.com-20080624004851-7jtxsha9djoqupu7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-06-24 02:13:13 +0100
    message:
      Fix trivial typo in 'bzr help status' reported by mlh.
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3350.167.1
        revision-id: andrew.bennetts at canonical.com-20080624004851-7jtxsha9djoqupu7
        parent: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: trivial
        timestamp: Tue 2008-06-24 10:48:51 +1000
        message:
          Fix trivial bug in 'bzr help status' reported by mlh on #bzr.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3350.2.157
    revision-id: pqm at pqm.ubuntu.com-20080623203807-3uudpo6dw8nxhxzz
    parent: pqm at pqm.ubuntu.com-20080620010918-64z4xylh1ap5hgyf
    parent: john at arbash-meinel.com-20080623201216-0hm9dxvq6murh8jl
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-06-23 21:38:07 +0100
    message:
      (jam) Updates to Tree.iter_references,
      	mostly to shortcut when there can be no references.
    modified:
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
      bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.166.2
        revision-id: john at arbash-meinel.com-20080623201216-0hm9dxvq6murh8jl
        parent: john at arbash-meinel.com-20080620190638-0vayap44pyg1kfrq
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Mon 2008-06-23 15:12:16 -0500
        message:
          Find some code that thought we were dealing in absolute paths
        modified:
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
        ------------------------------------------------------------
        revno: 3350.166.1
        revision-id: john at arbash-meinel.com-20080620190638-0vayap44pyg1kfrq
        parent: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2008-06-20 14:06:38 -0500
        message:
          Shortcut iter_references when we know references aren't supported.
          
          Also, improve the test coverage for RevisionTree and DirStateRevisionTree.
        modified:
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 3350.2.156
    revision-id: pqm at pqm.ubuntu.com-20080620010918-64z4xylh1ap5hgyf
    parent: pqm at pqm.ubuntu.com-20080620002425-fthsmp2t0ftzxp6c
    parent: ian.clatworthy at canonical.com-20080620004446-azoacvjesht32u7k
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-06-20 02:09:18 +0100
    message:
      Accept user names with @s in URLs (Neil Martinsen-Burrell)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
        ------------------------------------------------------------
        revno: 3350.165.1
        revision-id: ian.clatworthy at canonical.com-20080620004446-azoacvjesht32u7k
        parent: pqm at pqm.ubuntu.com-20080620002425-fthsmp2t0ftzxp6c
        parent: nmb at wartburg.edu-20080619065722-dboa3ko7ap8dcf2p
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Fri 2008-06-20 10:44:46 +1000
        message:
          Accept user names with @s in URLs (Neil Martinsen-Burrell)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
        ------------------------------------------------------------
        revno: 3350.164.1
        revision-id: nmb at wartburg.edu-20080619065722-dboa3ko7ap8dcf2p
        parent: pqm at pqm.ubuntu.com-20080617064715-bmm5fdshd3gzgyac
        committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
        branch nick: user-with-at
        timestamp: Thu 2008-06-19 01:57:22 -0500
        message:
          Fix bug 228058: user names with @ signs should work
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 3350.2.155
    revision-id: pqm at pqm.ubuntu.com-20080620002425-fthsmp2t0ftzxp6c
    parent: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
    parent: ian.clatworthy at canonical.com-20080619235828-ih9r1gj5np1vqwq7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-06-20 01:24:25 +0100
    message:
      Don't join the lines of the index twice (TimeHorse, James Westby)
    modified:
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
        ------------------------------------------------------------
        revno: 3350.163.1
        revision-id: ian.clatworthy at canonical.com-20080619235828-ih9r1gj5np1vqwq7
        parent: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
        parent: jw+debian at jameswestby.net-20080617093208-qc53mh27wi3o6snn
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Fri 2008-06-20 09:58:28 +1000
        message:
          Don't join the lines of the index twice (TimeHorse, James Westby)
        modified:
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
        ------------------------------------------------------------
        revno: 3350.162.1
        revision-id: jw+debian at jameswestby.net-20080617093208-qc53mh27wi3o6snn
        parent: pqm at pqm.ubuntu.com-20080617064715-bmm5fdshd3gzgyac
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev
        timestamp: Tue 2008-06-17 10:32:08 +0100
        message:
          Don't join the lines of the index twice.
        modified:
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
    ------------------------------------------------------------
    revno: 3350.2.154
    revision-id: pqm at pqm.ubuntu.com-20080619070027-3xv1vy81m3ix2oup
    parent: pqm at pqm.ubuntu.com-20080618051428-txnglk8ls5jd93fc
    parent: mnordhoff at mattnordhoff.com-20080618042741-pmoca2mffi1kh377
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-06-19 08:00:27 +0100
    message:
      Fix trivial typo in _is_remote_before's docstring. (Matt Nordhoff)
    modified:
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
        ------------------------------------------------------------
        revno: 3350.161.1
        revision-id: mnordhoff at mattnordhoff.com-20080618042741-pmoca2mffi1kh377
        parent: pqm at pqm.ubuntu.com-20080618032827-fq9wj33m0wfpurzv
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: _is_remote_before_typo
        timestamp: Wed 2008-06-18 04:27:41 +0000
        message:
          Fix a docstring typo, and a two-expression ``raise`` statement
        modified:
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
    ------------------------------------------------------------
    revno: 3350.2.153
    revision-id: pqm at pqm.ubuntu.com-20080618051428-txnglk8ls5jd93fc
    parent: pqm at pqm.ubuntu.com-20080618032827-fq9wj33m0wfpurzv
    parent: andrew.bennetts at canonical.com-20080618045053-4zgvoz9xu1h1zcri
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-18 06:14:28 +0100
    message:
      Fix the tree.branch returned by make_branch_and_tree. (Andrew
      	Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
      bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
        ------------------------------------------------------------
        revno: 3350.160.9
        revision-id: andrew.bennetts at canonical.com-20080618045053-4zgvoz9xu1h1zcri
        parent: andrew.bennetts at canonical.com-20080618005845-3y0ae9qp05d48que
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Wed 2008-06-18 14:50:53 +1000
        message:
          Add NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3350.160.8
        revision-id: andrew.bennetts at canonical.com-20080618005845-3y0ae9qp05d48que
        parent: andrew.bennetts at canonical.com-20080612000017-rj3iicm3ftpv1fin
        parent: andrew.bennetts at canonical.com-20080617043218-gm8jc3cdk0lgjcfv
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Wed 2008-06-18 10:58:45 +1000
        message:
          Merge from remote-is-at-least.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-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/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
        ------------------------------------------------------------
        revno: 3350.160.7
        revision-id: andrew.bennetts at canonical.com-20080612000017-rj3iicm3ftpv1fin
        parent: andrew.bennetts at canonical.com-20080611235934-dtn3wahp7xf2cdq0
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Thu 2008-06-12 10:00:17 +1000
        message:
          Update comments and docstrings, add NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3350.160.6
        revision-id: andrew.bennetts at canonical.com-20080611235934-dtn3wahp7xf2cdq0
        parent: andrew.bennetts at canonical.com-20080611075454-evxru0ssycsdywgd
        parent: andrew.bennetts at canonical.com-20080611235921-5j77i6gne7sh8x3s
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Thu 2008-06-12 09:59:34 +1000
        message:
          Merge from bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
        ------------------------------------------------------------
        revno: 3350.160.5
        revision-id: andrew.bennetts at canonical.com-20080611075454-evxru0ssycsdywgd
        parent: andrew.bennetts at canonical.com-20080611075225-vqv5d1p5wydryz49
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Wed 2008-06-11 17:54:54 +1000
        message:
          Tweak suggested by John's review.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3350.160.4
        revision-id: andrew.bennetts at canonical.com-20080611075225-vqv5d1p5wydryz49
        parent: andrew.bennetts at canonical.com-20080610074115-e4isop261jrba6ip
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Wed 2008-06-11 17:52:25 +1000
        message:
          Fix all tests broken by fixing make_branch_and_tree.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
          bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
        ------------------------------------------------------------
        revno: 3350.160.3
        revision-id: andrew.bennetts at canonical.com-20080610074115-e4isop261jrba6ip
        parent: andrew.bennetts at canonical.com-20080610050540-926drw1nk5ctqwbo
        parent: andrew.bennetts at canonical.com-20080610073759-ewmdzkasnyz6gagl
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Tue 2008-06-10 17:41:15 +1000
        message:
          Merge remote-is-at-least.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-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/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
        ------------------------------------------------------------
        revno: 3350.160.2
        revision-id: andrew.bennetts at canonical.com-20080610050540-926drw1nk5ctqwbo
        parent: andrew.bennetts at canonical.com-20080610050510-kx0fkha390ois9pq
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Tue 2008-06-10 15:05:40 +1000
        message:
          Fix RemoteToOtherFetcher to update count_copied.
        modified:
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 3350.160.1
        revision-id: andrew.bennetts at canonical.com-20080610050510-kx0fkha390ois9pq
        parent: pqm at pqm.ubuntu.com-20080609211646-amc2rr2zi50omr8m
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: make-branch-and-tree-fix
        timestamp: Tue 2008-06-10 15:05:10 +1000
        message:
          Fix make_branch_and_tree to return a tree whose .branch is always the right format.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3350.2.152
    revision-id: pqm at pqm.ubuntu.com-20080618032827-fq9wj33m0wfpurzv
    parent: pqm at pqm.ubuntu.com-20080618021553-nptumo40ezmv5ksr
    parent: andrew.bennetts at canonical.com-20080617043218-gm8jc3cdk0lgjcfv
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-18 04:28:27 +0100
    message:
      Better infrastructure for tracking remote server version in
      	SmartClientMedium. (Andrew Bennetts)
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-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/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
        ------------------------------------------------------------
        revno: 3350.159.10
        revision-id: andrew.bennetts at canonical.com-20080617043218-gm8jc3cdk0lgjcfv
        parent: andrew.bennetts at canonical.com-20080617042226-8kog0j96nztjgoa4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Tue 2008-06-17 14:32:18 +1000
        message:
          Change _is_remote_at_least to _is_remote_before.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-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: 3350.159.9
        revision-id: andrew.bennetts at canonical.com-20080617042226-8kog0j96nztjgoa4
        parent: andrew.bennetts at canonical.com-20080615234528-4co0hcs5tear0pva
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Tue 2008-06-17 14:22:26 +1000
        message:
          Rename _remote_is_not to _remember_remote_is_before.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3350.159.8
        revision-id: andrew.bennetts at canonical.com-20080615234528-4co0hcs5tear0pva
        parent: andrew.bennetts at canonical.com-20080611235921-5j77i6gne7sh8x3s
        parent: pqm at pqm.ubuntu.com-20080612170229-8h3mrl35jgqhs0gt
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Mon 2008-06-16 09:45:28 +1000
        message:
          Merge from bzr.dev.
        modified:
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
        ------------------------------------------------------------
        revno: 3350.159.7
        revision-id: andrew.bennetts at canonical.com-20080611235921-5j77i6gne7sh8x3s
        parent: andrew.bennetts at canonical.com-20080610073759-ewmdzkasnyz6gagl
        parent: pqm at pqm.ubuntu.com-20080611120348-tqhq37qvfz624jyb
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Thu 2008-06-12 09:59:21 +1000
        message:
          Merge from bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
        ------------------------------------------------------------
        revno: 3350.159.6
        revision-id: andrew.bennetts at canonical.com-20080610073759-ewmdzkasnyz6gagl
        parent: andrew.bennetts at canonical.com-20080605230057-raqbjdzpzvu4emf8
        parent: pqm at pqm.ubuntu.com-20080609211646-amc2rr2zi50omr8m
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Tue 2008-06-10 17:37:59 +1000
        message:
          Merge from bzr.dev.
        added:
          bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
          bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
          bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
          bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
          bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
          bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
          bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
          bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
        renamed:
          doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
          bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        ------------------------------------------------------------
        revno: 3350.159.5
        revision-id: andrew.bennetts at canonical.com-20080605230057-raqbjdzpzvu4emf8
        parent: andrew.bennetts at canonical.com-20080603224305-qmk0zbwc8kieqlbm
        parent: pqm at pqm.ubuntu.com-20080604222149-sq8txbpiit3ckogx
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Fri 2008-06-06 09:00:57 +1000
        message:
          Merge from bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3350.159.4
        revision-id: andrew.bennetts at canonical.com-20080603224305-qmk0zbwc8kieqlbm
        parent: andrew.bennetts at canonical.com-20080602231754-548g9nunvahbgkv1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Wed 2008-06-04 08:43:05 +1000
        message:
          Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
        modified:
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
        ------------------------------------------------------------
        revno: 3350.159.3
        revision-id: andrew.bennetts at canonical.com-20080602231754-548g9nunvahbgkv1
        parent: andrew.bennetts at canonical.com-20080529065132-rbfcrtmrbdgmqass
        parent: pqm at pqm.ubuntu.com-20080601233619-di6or8d3o26n917q
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Tue 2008-06-03 09:17:54 +1000
        message:
          Merge from 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/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          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/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
          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_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
          bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
          doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
          doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
          doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
        ------------------------------------------------------------
        revno: 3350.159.2
        revision-id: andrew.bennetts at canonical.com-20080529065132-rbfcrtmrbdgmqass
        parent: andrew.bennetts at canonical.com-20080529064343-raflmdzsj7bunjj1
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Thu 2008-05-29 16:51:32 +1000
        message:
          Remove whitespace nits.
        modified:
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
        ------------------------------------------------------------
        revno: 3350.159.1
        revision-id: andrew.bennetts at canonical.com-20080529064343-raflmdzsj7bunjj1
        parent: pqm at pqm.ubuntu.com-20080527013230-8qjaju10duxpy3e2
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: remote-is-at-least
        timestamp: Thu 2008-05-29 16:43:43 +1000
        message:
          Better infrastructure on SmartClientMedium for tracking the remote version.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
    ------------------------------------------------------------
    revno: 3350.2.151
    revision-id: pqm at pqm.ubuntu.com-20080618021553-nptumo40ezmv5ksr
    parent: pqm at pqm.ubuntu.com-20080618014427-zxkz0qy5140z7b32
    parent: mbp at sourcefrog.net-20080617012947-qwi4yxfadjtiozk1
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-18 03:15:53 +0100
    message:
      (mbp) better messages about missing libraries
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
        ------------------------------------------------------------
        revno: 3350.158.3
        revision-id: mbp at sourcefrog.net-20080617012947-qwi4yxfadjtiozk1
        parent: mbp at sourcefrog.net-20080617011349-jsqy1id9wgk2pqzs
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Tue 2008-06-17 11:29:47 +1000
        message:
          Clearer message about how to set PYTHONPATH
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
        ------------------------------------------------------------
        revno: 3350.158.2
        revision-id: mbp at sourcefrog.net-20080617011349-jsqy1id9wgk2pqzs
        parent: mbp at sourcefrog.net-20080617001839-6nteey06saa9b2k3
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Tue 2008-06-17 11:13:49 +1000
        message:
          Show short error for missing libraries
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3350.158.1
        revision-id: mbp at sourcefrog.net-20080617001839-6nteey06saa9b2k3
        parent: pqm at pqm.ubuntu.com-20080616174225-2eokonl40p9ogzbw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Tue 2008-06-17 10:18:39 +1000
        message:
          Add note to update GNU directory
        modified:
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 3350.2.150
    revision-id: pqm at pqm.ubuntu.com-20080618014427-zxkz0qy5140z7b32
    parent: pqm at pqm.ubuntu.com-20080618001911-njznhgcbmok0bjsz
    parent: mbp at sourcefrog.net-20080617035549-emg8t92hp5lvxmz6
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-18 02:44:27 +0100
    message:
      (mbp) Remove obsolete cmd_fetch
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3350.157.1
        revision-id: mbp at sourcefrog.net-20080617035549-emg8t92hp5lvxmz6
        parent: pqm at pqm.ubuntu.com-20080616174225-2eokonl40p9ogzbw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: deprecation
        timestamp: Tue 2008-06-17 13:55:49 +1000
        message:
          Remove obsolete cmd_fetch
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3350.2.149
    revision-id: pqm at pqm.ubuntu.com-20080618001911-njznhgcbmok0bjsz
    parent: pqm at pqm.ubuntu.com-20080617064715-bmm5fdshd3gzgyac
    parent: mbp at sourcefrog.net-20080617040749-8fkk0lx81189n8hw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-18 01:19:11 +0100
    message:
      (mbp) disable test_35_wait_lock_changing
    modified:
      bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
        ------------------------------------------------------------
        revno: 3350.156.1
        revision-id: mbp at sourcefrog.net-20080617040749-8fkk0lx81189n8hw
        parent: pqm at pqm.ubuntu.com-20080616174225-2eokonl40p9ogzbw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 213182_lock_tests
        timestamp: Tue 2008-06-17 14:07:49 +1000
        message:
          xfail test_35_wait_lock_changing
        modified:
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
    ------------------------------------------------------------
    revno: 3350.2.148
    revision-id: pqm at pqm.ubuntu.com-20080617064715-bmm5fdshd3gzgyac
    parent: pqm at pqm.ubuntu.com-20080616174225-2eokonl40p9ogzbw
    parent: aaron at aaronbentley.com-20080616165505-72azw96gince2kp0
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-06-17 07:47:15 +0100
    message:
      Tolerate ghost parents of revision 1 (abentley, #235055)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
        ------------------------------------------------------------
        revno: 3350.155.1
        revision-id: aaron at aaronbentley.com-20080616165505-72azw96gince2kp0
        parent: pqm at pqm.ubuntu.com-20080612170229-8h3mrl35jgqhs0gt
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ghost-parent
        timestamp: Mon 2008-06-16 12:55:05 -0400
        message:
          Tolerate ghosts in mainline (#235055)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
    ------------------------------------------------------------
    revno: 3350.2.147
    revision-id: pqm at pqm.ubuntu.com-20080616174225-2eokonl40p9ogzbw
    parent: pqm at pqm.ubuntu.com-20080616163909-4c3sncedblcbfp2p
    parent: john at arbash-meinel.com-20080616171410-b13qfkdypb3af28q
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-06-16 18:42:25 +0100
    message:
      (jam, spiv) bug #125784,
      	the lock decorators should avoid suppressing an error in the called
      	function if there is an error while unlocking
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
      bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
        ------------------------------------------------------------
        revno: 3316.3.4
        revision-id: john at arbash-meinel.com-20080616171410-b13qfkdypb3af28q
        parent: john at arbash-meinel.com-20080616171149-q4cryeayazevsjlk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: safer-lock-decorator
        timestamp: Mon 2008-06-16 12:14:10 -0500
        message:
          put NEWS entry in the right place
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3316.3.3
        revision-id: john at arbash-meinel.com-20080616171149-q4cryeayazevsjlk
        parent: john at arbash-meinel.com-20080608170025-6jd29enxnk3d5sy9
        parent: pqm at pqm.ubuntu.com-20080616163909-4c3sncedblcbfp2p
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: safer-lock-decorator
        timestamp: Mon 2008-06-16 12:11:49 -0500
        message:
          merge dev, resolve
        removed:
          bzrlib/xml6.py                 xml6.py-20060823042456-dbaaq4atrche7xy5-1
        added:
          bzrlib/smart/message.py        message.py-20080222013625-ncqmh3nrxjkxab87-1
          bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
          bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
          bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
          bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
          bzrlib/tests/file_utils.py     file_utils.py-20080506145406-a1h3ydg2lsh2iriy-1
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
          bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
          bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
          bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
          bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
          bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
          bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
          bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
          bzrlib/tests/repository_implementations/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
          bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
          bzrlib/transport/nosmart.py    nosmart.py-20080402095843-6ib17idympwy1zkr-1
          bzrlib/xml5.py                 xml5.py-20080328030717-t9guwinq8hom0ar3-1
          bzrlib/xml6.py                 xml6.py-20080327235607-1skmbg4o9cd1o636-1
          doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          doc/developers/repository-stream.txt repositorystream.txt-20080410222511-nh6b9bvscvcerh48-1
          doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
          doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
          doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
          doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
          doc/es/                        es-20080504181154-x2fm3oprvjohiz7n-1
          doc/es/guia-desarrollador/     guiadesarrollador-20080504181514-qlh50dq1mj769bic-1
          doc/es/guia-usuario/           guiausuario-20080504181514-qlh50dq1mj769bic-2
          doc/es/guia-usuario/index.txt  index.txt-20080512005856-hgdxkh9xo58n7zdp-2
          doc/es/guia-usuario/resolving_conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
          doc/es/guia-usuario/version_info.txt version_info.txt-20080504181730-u24nugzokrcrk1bf-1
          doc/es/mini-tutorial/          minitutorial-20080504181514-qlh50dq1mj769bic-3
          doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
          doc/es/notas-version/          notasversion-20080504181514-qlh50dq1mj769bic-4
          doc/es/referencia/             referencia-20080504181514-qlh50dq1mj769bic-5
          doc/es/referencia-rapida/      referenciarapida-20080504181514-qlh50dq1mj769bic-6
          doc/es/referencia-rapida/Makefile makefile-20080506002609-y60mr4avuqwzlf4s-1
          doc/es/referencia-rapida/referencia-rapida.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
          doc/index.es.txt               index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
        renamed:
          bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
          doc/en/user-guide/best_practice_intro.txt => doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
          doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
          bzrlib/_patiencediff_py.py     cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
          bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/atomicfile.py           atomicfile.py-20050509044450-dbd24e6c564f7c66
          bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
          bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
          bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/deprecated_graph.py     graph.py-20050905070950-b47dce53236c5e48
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/doc/__init__.py         __init__.py-20051224020731-eb3eb3ef5b4570df
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
          bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
          bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
          bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          bzrlib/hooks.py                hooks.py-20070325015548-ix4np2q0kd8452au-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/intset.py               intset.py-20050717175247-81cd658f9aaa2731
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lazy_import.py          lazy_import.py-20060910203832-f77c54gf3n232za0-1
          bzrlib/lazy_regex.py           lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
          bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/rio.py                  rio.py-20051128032247-770b120b34dfff60
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-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/smart/vfs.py            vfs.py-20061108095550-gunadhxmzkdjfeek-2
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
          bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
          bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
          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_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
          bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          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_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
          bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
          bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
          bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
          bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
          bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
          bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
          bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
          bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/repository_implementations/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
          bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
          bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
          bzrlib/tests/test_ancestry.py  test_ancestry.py-20050913023709-69768e94848312c6
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
          bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
          bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          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_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
          bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
          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_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-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_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
          bzrlib/tests/test_strace.py    test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
          bzrlib/tests/test_subsume.py   test_subsume.py-20060927040024-tsvh4pchajoayymg-1
          bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
          bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/test_wsgi.py      test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
          bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
          bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
          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/treeshape.py      treeshape.py-20051004094628-312a98f0194306a8
          bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
          bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
          bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
          bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/textinv.py              textinv.py-20050411024435-e3898231b7d1897b26c38878
          bzrlib/textui.py               textui.py-20050309040759-5d0cebe09c528e7d
          bzrlib/timestamp.py            timestamp.py-20070306142322-ttbb9oulf3jotljd-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transactions.py         transactions.py-20051007010900-f1313d53cf58e223
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/fakenfs.py    fakenfs.py-20060402223312-0e29c7275aa384dd
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/treebuilder.py          treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/weavefile.py            weavefile.py-20050629135233-2ffe0200f103f6c2
          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/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
          doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
          doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
          doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
          doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
          doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
          doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/xml8.py                 xml5.py-20050907032657-aac8f960815b66b1
          doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
          doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        ------------------------------------------------------------
        revno: 3316.3.2
        revision-id: john at arbash-meinel.com-20080608170025-6jd29enxnk3d5sy9
        parent: andrew.bennetts at canonical.com-20080331015438-1k5c8mqeag6ff9vk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: safer-lock-decorator
        timestamp: Sun 2008-06-08 12:00:25 -0500
        message:
          Finish fix for bug #125784. need_read/write_lock decorators should attempt to raise an original exception.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
          bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
        ------------------------------------------------------------
        revno: 3316.3.1
        revision-id: andrew.bennetts at canonical.com-20080331015438-1k5c8mqeag6ff9vk
        parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: safer-lock-decorator
        timestamp: Mon 2008-03-31 12:54:38 +1100
        message:
          Try not to lose the original exception in needs_write_lock decorator if the unlock raises a secondary exception.
        modified:
          bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
    ------------------------------------------------------------
    revno: 3350.2.146
    revision-id: pqm at pqm.ubuntu.com-20080616163909-4c3sncedblcbfp2p
    parent: pqm at pqm.ubuntu.com-20080612170229-8h3mrl35jgqhs0gt
    parent: john at arbash-meinel.com-20080616161326-vgdid836pbf3f51i
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-06-16 17:39:09 +0100
    message:
      (jam) Bug #239933 use the rigth exception for -c0
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        ------------------------------------------------------------
        revno: 3350.154.2
        revision-id: john at arbash-meinel.com-20080616161326-vgdid836pbf3f51i
        parent: john at arbash-meinel.com-20080615230814-euzbbh2528vzi2d8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Mon 2008-06-16 11:13:26 -0500
        message:
          tweak
        modified:
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        ------------------------------------------------------------
        revno: 3350.154.1
        revision-id: john at arbash-meinel.com-20080615230814-euzbbh2528vzi2d8
        parent: pqm at pqm.ubuntu.com-20080612170229-8h3mrl35jgqhs0gt
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Sun 2008-06-15 18:08:14 -0500
        message:
          Fix bug #239933, use the right exception for -c0
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
    ------------------------------------------------------------
    revno: 3350.2.145
    revision-id: pqm at pqm.ubuntu.com-20080612170229-8h3mrl35jgqhs0gt
    parent: pqm at pqm.ubuntu.com-20080611120348-tqhq37qvfz624jyb
    parent: john at arbash-meinel.com-20080612155115-0wd59iyv2njaigx7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-06-12 18:02:29 +0100
    message:
      (jam) Make sure we always have access to the elementtree.ElementTree
      	module.
    modified:
      bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
        ------------------------------------------------------------
        revno: 3350.146.2
        revision-id: john at arbash-meinel.com-20080612155115-0wd59iyv2njaigx7
        parent: j at oil21.org-20080605121314-kv2l34nc1knvj7q5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2008-06-12 10:51:15 -0500
        message:
          Fix missing import
        modified:
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
    ------------------------------------------------------------
    revno: 3350.2.144
    revision-id: pqm at pqm.ubuntu.com-20080611120348-tqhq37qvfz624jyb
    parent: pqm at pqm.ubuntu.com-20080611042056-m5e074q47s9gwwjj
    parent: andrew.bennetts at canonical.com-20080611110805-oluknyiukp111t13
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-06-11 13:03:48 +0100
    message:
      Fix infinite busy-loop caused by connection loss during read of
      	response body in HPSS v1 and v2. (Andrew Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
    ------------------------------------------------------------
    revno: 3350.153.2
    revision-id: andrew.bennetts at canonical.com-20080611110805-oluknyiukp111t13
    parent: andrew.bennetts at canonical.com-20080602011217-91w8f210rc3adv6g
    parent: pqm at pqm.ubuntu.com-20080609211646-amc2rr2zi50omr8m
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: interrupted-connection-fix
    timestamp: Wed 2008-06-11 21:08:05 +1000
    message:
      Merge from bzr.dev.
    added:
      bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
      bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
      bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
      bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
      bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
      bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
      bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
      bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
      bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
      bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
    renamed:
      doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
      bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
      bzrlib/counted_lock.py         counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
      bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
      bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
      bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
      bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
      bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
      bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
      bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
      bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
      bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
      bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
      bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
      doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
      doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
      doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
    ------------------------------------------------------------
    revno: 3350.153.1
    revision-id: andrew.bennetts at canonical.com-20080602011217-91w8f210rc3adv6g
    parent: pqm at pqm.ubuntu.com-20080601233619-di6or8d3o26n917q
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: interrupted-connection-fix
    timestamp: Mon 2008-06-02 11:12:17 +1000
    message:
      Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2

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



More information about the bazaar-commits mailing list