Rev 3320: Merge .dev. in http://people.ubuntu.com/~robertc/baz2.0/versioned_files

Robert Collins robertc at robertcollins.net
Mon Apr 7 05:55:04 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/versioned_files

------------------------------------------------------------
revno: 3320
revision-id: robertc at robertcollins.net-20080407045452-8r6asf9hs0cl5jvy
parent: robertc at robertcollins.net-20080404000658-uw2nmrw8t5kcqbly
parent: pqm at pqm.ubuntu.com-20080407012644-p1nash3ycyh2f5n8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api-cleanup
timestamp: Mon 2008-04-07 14:54:52 +1000
message:
  Merge .dev.
added:
  bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
  doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
    ------------------------------------------------------------
    revno: 3316.2.24
    revision-id: pqm at pqm.ubuntu.com-20080407012644-p1nash3ycyh2f5n8
    parent: pqm at pqm.ubuntu.com-20080406162820-yto4yesv7cnrybbt
    parent: robertc at robertcollins.net-20080406233706-3md3w1c651a0pndm
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-04-07 02:26:44 +0100
    message:
      (robertc) Add a plugin-api.txt developer document starting to
      	description services for/from plugins. (Robert Collins)
    added:
      doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
    modified:
      doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
        ------------------------------------------------------------
        revno: 3246.6.3
        revision-id: robertc at robertcollins.net-20080406233706-3md3w1c651a0pndm
        parent: robertc at robertcollins.net-20080404043834-wc6bp7fdls2w3rf5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: plugin_api
        timestamp: Mon 2008-04-07 09:37:06 +1000
        message:
          Fix ReST table formatting in doc/developers/plugin-api.txt.
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3246.6.2
        revision-id: robertc at robertcollins.net-20080404043834-wc6bp7fdls2w3rf5
        parent: robertc at robertcollins.net-20080229110908-uiik8oo46rho0tn2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: plugin_api
        timestamp: Fri 2008-04-04 15:38:34 +1100
        message:
          Review feedback.
        modified:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        ------------------------------------------------------------
        revno: 3246.6.1
        revision-id: robertc at robertcollins.net-20080229110908-uiik8oo46rho0tn2
        parent: pqm at pqm.ubuntu.com-20080229011300-p50it0si2y8mbv0d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: plugin_api
        timestamp: Fri 2008-02-29 22:09:08 +1100
        message:
          Add a plugin-api.txt developer document starting to description services for/from plugins.
        added:
          doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
        modified:
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
    ------------------------------------------------------------
    revno: 3316.2.23
    revision-id: pqm at pqm.ubuntu.com-20080406162820-yto4yesv7cnrybbt
    parent: pqm at pqm.ubuntu.com-20080406101328-z1x7a0hsejxblf39
    parent: aaron at aaronbentley.com-20080404042019-zwpkw158y1411rw7
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-04-06 17:28:20 +0100
    message:
      Don't traceback when adding files to a deleted root (abentley,
      	#210092)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 1551.19.32
        revision-id: aaron at aaronbentley.com-20080404042019-zwpkw158y1411rw7
        parent: aaron at aaronbentley.com-20080404025402-fz0ofdazbbg11atf
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2008-04-04 00:20:19 -0400
        message:
          Don't traceback when adding files to a deleted root (abentley, #210092)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 1551.19.31
        revision-id: aaron at aaronbentley.com-20080404025402-fz0ofdazbbg11atf
        parent: aaron at aaronbentley.com-20080319193935-ni2v13574apz1yl5
        parent: pqm at pqm.ubuntu.com-20080404013911-s5ozllh7002ymmdt
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2008-04-03 22:54:02 -0400
        message:
          Merge bzr.dev
        added:
          bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
          bzrlib/transport/nosmart.py    nosmart.py-20080402095843-6ib17idympwy1zkr-1
        renamed:
          bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
          bzrlib/_knit_load_data_py.py   _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-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/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-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/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          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/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-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/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
          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_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          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_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          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_wsgi.py      test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          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/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
    ------------------------------------------------------------
    revno: 3316.2.22
    revision-id: pqm at pqm.ubuntu.com-20080406101328-z1x7a0hsejxblf39
    parent: pqm at pqm.ubuntu.com-20080406083627-bx7vnc0sdjfd2nvs
    parent: gary.wilson at gmail.com-20080403052157-hzii4ckr2n6bwxfr
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-04-06 11:13:28 +0100
    message:
      (Gary Wilson Jr.) core_concepts documentation corrections
    modified:
      doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.8
        revision-id: gary.wilson at gmail.com-20080403052157-hzii4ckr2n6bwxfr
        parent: gary.wilson at gmail.com-20080403051759-lpy04q450cmwdykp
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Thu 2008-04-03 00:21:57 -0500
        message:
          Corrected misspelling.
        modified:
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.7
        revision-id: gary.wilson at gmail.com-20080403051759-lpy04q450cmwdykp
        parent: gary.wilson at gmail.com-20080403051046-qgt8di676t0la57w
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Thu 2008-04-03 00:17:59 -0500
        message:
          Added a comma and capitalized first word of a couple list items.
        modified:
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.6
        revision-id: gary.wilson at gmail.com-20080403051046-qgt8di676t0la57w
        parent: gary.wilson at gmail.com-20080403050615-r4ue9d3i5ryjsh4m
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Thu 2008-04-03 00:10:46 -0500
        message:
          Removed ending punctuation from simple list.
        modified:
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.5
        revision-id: gary.wilson at gmail.com-20080403050615-r4ue9d3i5ryjsh4m
        parent: gary.wilson at gmail.com-20080403050413-2ha93u72k778q6y0
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Thu 2008-04-03 00:06:15 -0500
        message:
          Removed trailing whitespace.
        modified:
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.4
        revision-id: gary.wilson at gmail.com-20080403050413-2ha93u72k778q6y0
        parent: gary.wilson at gmail.com-20080330035843-jg5ry61ax8h0jxy7
        parent: pqm at pqm.ubuntu.com-20080403035509-qsxozetmg702c4p0
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Thu 2008-04-03 00:04:13 -0500
        message:
          Merged from bzr.dev.
        renamed:
          bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        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/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/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/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          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_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_wsgi.py      test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        ------------------------------------------------------------
        revno: 3299.3.3
        revision-id: gary.wilson at gmail.com-20080330035843-jg5ry61ax8h0jxy7
        parent: gary.wilson at gmail.com-20080330025829-ueaq6p0tv7f0m39o
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Sat 2008-03-29 22:58:43 -0500
        message:
          Capitalized first word in list items.
        modified:
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.2
        revision-id: gary.wilson at gmail.com-20080330025829-ueaq6p0tv7f0m39o
        parent: gary.wilson at gmail.com-20080329223649-9fel1068k158ljdf
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Sat 2008-03-29 21:58:29 -0500
        message:
          Several small changes to core_concepts docs:
          
          * Fixed a couple misspellings.
          * Several punctuation, capitalization, and grammar fixes.
          * Made all bulleted lists use a common indention.
        modified:
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
        ------------------------------------------------------------
        revno: 3299.3.1
        revision-id: gary.wilson at gmail.com-20080329223649-9fel1068k158ljdf
        parent: pqm at pqm.ubuntu.com-20080320180614-grrzhydka050ap3a
        parent: pqm at pqm.ubuntu.com-20080329121122-edbj8ht3fbr35nfs
        committer: Gary Wilson Jr. <gary.wilson at gmail.com>
        branch nick: core-concepts-docs
        timestamp: Sat 2008-03-29 17:36:49 -0500
        message:
          Merged upstream changes.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
          bzrlib/_knit_load_data_py.py   _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/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/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-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/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          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/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
    ------------------------------------------------------------
    revno: 3316.2.21
    revision-id: pqm at pqm.ubuntu.com-20080406083627-bx7vnc0sdjfd2nvs
    parent: pqm at pqm.ubuntu.com-20080405164635-lpul8ep0famwf5u5
    parent: bialix at ukr.net-20080406064455-mms91lq9wkecx5v9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-04-06 09:36:27 +0100
    message:
      (Toshio Kuratomi) look for plugins in arch-independent site directory
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3232.1.3
        revision-id: bialix at ukr.net-20080406064455-mms91lq9wkecx5v9
        parent: bialix at ukr.net-20080403205142-7b3q6eh1zhojuy0d
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: toshio
        timestamp: Sun 2008-04-06 09:44:55 +0300
        message:
          fixing test_set_plugins_path_with_trailing_slashes.
        modified:
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3232.1.2
        revision-id: bialix at ukr.net-20080403205142-7b3q6eh1zhojuy0d
        parent: bialix at ukr.net-20080223220701-cksxi7a5qfmb3whc
        parent: pqm at pqm.ubuntu.com-20080403080121-tbx3clqp8wqe776c
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: toshio
        timestamp: Thu 2008-04-03 23:51:42 +0300
        message:
          merge bzr.dev
        added:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
          bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
          bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
          bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
          bzrlib/transport/nosmart.py    nosmart.py-20080402095843-6ib17idympwy1zkr-1
          doc/en/admin-guide/            docenadminguide-20080305135054-y7y2c986yf94zljn-1
          doc/en/admin-guide/index.txt   index.txt-20080305140741-ecw0lap8dxkxc05g-1
        renamed:
          bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
          bzrlib/_knit_load_data_py.py   _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          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/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/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/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-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/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/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          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_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
          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_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          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/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-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/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          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_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          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_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_merge3.py    merge3.py-20050704130834-556689114c89e6f2
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          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_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          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_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          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_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          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/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
          bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
          bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          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/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
          bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
          bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
          bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
          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/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/lca-merge.txt   lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-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/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          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/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
          doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        ------------------------------------------------------------
        revno: 3232.1.1
        revision-id: bialix at ukr.net-20080223220701-cksxi7a5qfmb3whc
        parent: pqm at pqm.ubuntu.com-20080223160808-81yb25z7tmhlss8q
        author: Toshio Kuratomi <a.badger at gmail.com>
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: toshio
        timestamp: Sun 2008-02-24 00:07:01 +0200
        message:
          look for plugins in arch-independent site directory
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
    ------------------------------------------------------------
    revno: 3316.2.20
    revision-id: pqm at pqm.ubuntu.com-20080405164635-lpul8ep0famwf5u5
    parent: pqm at pqm.ubuntu.com-20080404122038-852408u460mitk5y
    parent: jelmer at samba.org-20080405134537-br55msytmlapxjvf
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-04-05 17:46:35 +0100
    message:
      (Jelmer) Add MutableTree start_commit hook.
    added:
      bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 3316.13.4
        revision-id: jelmer at samba.org-20080405134537-br55msytmlapxjvf
        parent: jelmer at samba.org-20080405022911-d6tfmx6y30e3f6cx
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: start-commit-hook
        timestamp: Sat 2008-04-05 15:45:37 +0200
        message:
          Fix indentation, add version number.
        modified:
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
        ------------------------------------------------------------
        revno: 3316.13.3
        revision-id: jelmer at samba.org-20080405022911-d6tfmx6y30e3f6cx
        parent: jelmer at samba.org-20080405014818-0nene03mynptkxae
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: start-commit-hook
        timestamp: Sat 2008-04-05 04:29:11 +0200
        message:
          Add tests for start_commit hook.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 3316.13.2
        revision-id: jelmer at samba.org-20080405014818-0nene03mynptkxae
        parent: jelmer at samba.org-20080405014646-0vav5xn9xud7eaoe
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: start-commit-hook
        timestamp: Sat 2008-04-05 03:48:18 +0200
        message:
          Add mutabletree hooks class and start_commit hook.
        modified:
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
        ------------------------------------------------------------
        revno: 3316.13.1
        revision-id: jelmer at samba.org-20080405014646-0vav5xn9xud7eaoe
        parent: pqm at pqm.ubuntu.com-20080404122038-852408u460mitk5y
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: start-commit-hook
        timestamp: Sat 2008-04-05 03:46:46 +0200
        message:
          Add tests for mutabletree hooks.
        added:
          bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3316.2.19
    revision-id: pqm at pqm.ubuntu.com-20080404122038-852408u460mitk5y
    parent: pqm at pqm.ubuntu.com-20080404055943-evqxhz3x63dz9wbt
    parent: v.ladeuil+lp at free.fr-20080404104423-ugwfbqj7i7pry897
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-04-04 13:20:38 +0100
    message:
      (vila) More aggressive test loader for selftest --load-list
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3316.12.1
        revision-id: v.ladeuil+lp at free.fr-20080404104423-ugwfbqj7i7pry897
        parent: pqm at pqm.ubuntu.com-20080404055943-evqxhz3x63dz9wbt
        parent: v.ladeuil+lp at free.fr-20080402134513-xfj7652jfsxg6hwh
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: trunk
        timestamp: Fri 2008-04-04 12:44:23 +0200
        message:
          More aggressive test loader for selftest --load-list
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.21
        revision-id: v.ladeuil+lp at free.fr-20080402134513-xfj7652jfsxg6hwh
        parent: v.ladeuil+lp at free.fr-20080401094234-ied49b94be3tiwlq
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-04-02 15:45:13 +0200
        message:
          Fixed as per Robert's review.
          
          * bzrlib/tests/test_plugins.py:
          (TestPlugins.test_no_load_plugin_tests_gives_None_for_load_plugin_tests,
          TestPlugins.test_load_plugin_tests_gives_load_plugin_tests_result):
          Updated.
          
          * bzrlib/tests/__init__.py:
          (test_suite): Use load_plugin_tests for plugins.
          
          * bzrlib/plugin.py:
          (PlugIn.load_plugin_tests): Renamed from load_tests to avoid
          confusion disambiguate with the load_tests function defined in
          test modules and plugin modules.
        modified:
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3302.8.20
        revision-id: v.ladeuil+lp at free.fr-20080401094234-ied49b94be3tiwlq
        parent: v.ladeuil+lp at free.fr-20080401093717-u3oywqologcr1s7d
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Tue 2008-04-01 11:42:34 +0200
        message:
          Add NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3302.8.19
        revision-id: v.ladeuil+lp at free.fr-20080401093717-u3oywqologcr1s7d
        parent: v.ladeuil+lp at free.fr-20080401083930-6jak7atgwu3q00yr
        parent: pqm at pqm.ubuntu.com-20080401091848-6y4f104r061ad8bk
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Tue 2008-04-01 11:37:17 +0200
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/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/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          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_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_wsgi.py      test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
        ------------------------------------------------------------
        revno: 3302.8.18
        revision-id: v.ladeuil+lp at free.fr-20080401083930-6jak7atgwu3q00yr
        parent: v.ladeuil+lp at free.fr-20080331171715-ovu1ubxwv10nvxit
        parent: v.ladeuil+lp at free.fr-20080331172008-o31h3ai3qb8vwjx4
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Tue 2008-04-01 10:39:30 +0200
        message:
          merge down-thread
        ------------------------------------------------------------
        revno: 3302.8.17
        revision-id: v.ladeuil+lp at free.fr-20080331171715-ovu1ubxwv10nvxit
        parent: v.ladeuil+lp at free.fr-20080331161703-0ueczeko01f5bf2v
        parent: v.ladeuil+lp at free.fr-20080331171123-d1aihpfvqnx6u8mp
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-31 19:17:15 +0200
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
        ------------------------------------------------------------
        revno: 3302.8.16
        revision-id: v.ladeuil+lp at free.fr-20080331161703-0ueczeko01f5bf2v
        parent: v.ladeuil+lp at free.fr-20080330202852-doh9ipbxw6zewnc7
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-31 18:17:03 +0200
        message:
          Add an optional loader parameter needed when deploying the test
          loader for parametrized inventory_implementations and
          repository_implementations tests.
          
          * bzrlib/tests/__init__.py:
          (multiply_tests_from_modules): Add an optional loader parameter.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3302.8.15
        revision-id: v.ladeuil+lp at free.fr-20080330202852-doh9ipbxw6zewnc7
        parent: v.ladeuil+lp at free.fr-20080326214440-hvwb7zsfp827m3lq
        parent: v.ladeuil+lp at free.fr-20080330202829-5ups6isujc9z5p8i
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Sun 2008-03-30 22:28:52 +0200
        message:
          merge bzr.dev
        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/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          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/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          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/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          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/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
        ------------------------------------------------------------
        revno: 3302.8.14
        revision-id: v.ladeuil+lp at free.fr-20080326214440-hvwb7zsfp827m3lq
        parent: v.ladeuil+lp at free.fr-20080326213706-ekg9wg715ynpq16n
        parent: v.ladeuil+lp at free.fr-20080326214357-q0b9195s9qqfc2pw
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 22:44:40 +0100
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
          bzrlib/_knit_load_data_py.py   _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
        ------------------------------------------------------------
        revno: 3302.8.13
        revision-id: v.ladeuil+lp at free.fr-20080326213706-ekg9wg715ynpq16n
        parent: v.ladeuil+lp at free.fr-20080326121905-8smldtdh74skxa1i
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 22:37:06 +0100
        message:
          DocTests can now be filtered at module level too.
          
          * bzrlib/tests/__init__.py:
          (MODULES_TO_DOCTEST): Moved to test_suite().
          (test_suite): DocTestSuite is perfectly happy with a module name.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3302.8.12
        revision-id: v.ladeuil+lp at free.fr-20080326121905-8smldtdh74skxa1i
        parent: v.ladeuil+lp at free.fr-20080326112940-leugmcpkbzox54c1
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 13:19:05 +0100
        message:
          Simplify tests.test_suite.
          
          * bzrlib/tests/__init__.py:
          (test_suite): Simplified by creating a
          TestFilteredByModuleTestLoader if needed, using the appropriate
          loader for every category of tests and filtering once at the
          end. Punt for DocTests to keep the commit short.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3302.8.11
        revision-id: v.ladeuil+lp at free.fr-20080326112940-leugmcpkbzox54c1
        parent: v.ladeuil+lp at free.fr-20080326090634-1yv15m2m2e08uezt
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 12:29:40 +0100
        message:
          Simplify plugin.load_tests.
          
          * bzrlib/tests/test_plugins.py:
          (TestPlugins.test_no_load_tests_gives_None_for_load_tests)
          (TestPlugins.test_load_tests_gives_load_tests_result): Make the
          tests a bit more real.
        modified:
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3302.8.10
        revision-id: v.ladeuil+lp at free.fr-20080326090634-1yv15m2m2e08uezt
        parent: v.ladeuil+lp at free.fr-20080326084201-5nk05zka1xnoua90
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 10:06:34 +0100
        message:
          Prepare bzrlib.plugin to use the new test loader.
          
          * bzrlib/tests/test_plugins.py:
          (TestPlugins.test_no_load_tests_gives_None_for_load_tests): Smoke
          tests for plugin.load_tests().
          
          * bzrlib/plugin.py:
          (PlugIn.load_tests): Add the ability to use load_tests() instead
          of test_suite().
        modified:
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3302.8.9
        revision-id: v.ladeuil+lp at free.fr-20080326084201-5nk05zka1xnoua90
        parent: v.ladeuil+lp at free.fr-20080326084115-uw91u4rgwg40zkri
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 09:42:01 +0100
        message:
          Fix wrong conflict resolution. loom-newbie error.
          
          * bzrlib/tests/__init__.py:
          (test_suite): Fix wrong conflict resolution.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3302.8.8
        revision-id: v.ladeuil+lp at free.fr-20080326084115-uw91u4rgwg40zkri
        parent: v.ladeuil+lp at free.fr-20080324220405-vov4nc8l72gez4zx
        parent: v.ladeuil+lp at free.fr-20080326081001-akh733lcdhiep83b
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Wed 2008-03-26 09:41:15 +0100
        message:
          Fix typos
        modified:
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.7
        revision-id: v.ladeuil+lp at free.fr-20080324220405-vov4nc8l72gez4zx
        parent: v.ladeuil+lp at free.fr-20080324191554-gkdmoqva25niz2iz
        parent: v.ladeuil+lp at free.fr-20080324220159-1d3l3niap11l5bhi
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 23:04:05 +0100
        message:
          Remove cruft
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3302.8.6
        revision-id: v.ladeuil+lp at free.fr-20080324191554-gkdmoqva25niz2iz
        parent: v.ladeuil+lp at free.fr-20080324184517-poyn4rh728ycmf5a
        parent: v.ladeuil+lp at free.fr-20080324191512-mcx6mmm1cfcz38fa
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 20:15:54 +0100
        message:
          Help identify duplicates IDs in test suite
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.5
        revision-id: v.ladeuil+lp at free.fr-20080324184517-poyn4rh728ycmf5a
        parent: v.ladeuil+lp at free.fr-20080324183945-ghjjej8evq317az0
        parent: v.ladeuil+lp at free.fr-20080324184438-9f3qbvf83jo1pqdm
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 19:45:17 +0100
        message:
          merge down thread
        modified:
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.4
        revision-id: v.ladeuil+lp at free.fr-20080324183945-ghjjej8evq317az0
        parent: v.ladeuil+lp at free.fr-20080324183216-65qxsdvvjud16rpc
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 19:39:45 +0100
        message:
          Cosmetic changes.
          
          * bzrlib/tests/test_selftest.py:
          (TestFilteredByModuleTestLoader._create_loader): Fix useless
          broken line.
          
          * bzrlib/tests/__init__.py:
          (condition_id_in_list): Fix comment.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.3
        revision-id: v.ladeuil+lp at free.fr-20080324183216-65qxsdvvjud16rpc
        parent: v.ladeuil+lp at free.fr-20080324181758-pzlqy05mg3ktdivu
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 19:32:16 +0100
        message:
          Use better names for TestIdList methods.
          
          * bzrlib/tests/test_selftest.py:
          Update tests.
          
          * bzrlib/tests/__init__.py:
          (TestIdList.is_module_name_used): Renamed to refers_to.
          (TestIdList.test_in): Renamed to includes.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.2
        revision-id: v.ladeuil+lp at free.fr-20080324181758-pzlqy05mg3ktdivu
        parent: v.ladeuil+lp at free.fr-20080324181430-91hpx1x34cfexygw
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 19:17:58 +0100
        message:
          New test loader reducing modules imports and tests loaded.
          
          * bzrlib/tests/test_selftest.py:
          (TestFilteredByModuleTestLoader): Tests for a loader that don't
          import unneeded modules.
          * bzrlib/tests/TestUtil.py:
          (FilteredByModuleTestLoader): Specialized loader importing and
          loading tests for a reduced set of modules.
        modified:
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.8.1
        revision-id: v.ladeuil+lp at free.fr-20080324181430-91hpx1x34cfexygw
        parent: v.ladeuil+lp at free.fr-20080324174247-ngn30tddzl2x3hyr
        parent: v.ladeuil+lp at free.fr-20080324181042-15cfp1w770nf3pgb
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: filter-by-module-test-loader
        timestamp: Mon 2008-03-24 19:14:30 +0100
        message:
          merge down-thread
        modified:
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    revno: 3316.2.18
    revision-id: pqm at pqm.ubuntu.com-20080404055943-evqxhz3x63dz9wbt
    parent: pqm at pqm.ubuntu.com-20080404040539-d5h9wmdw179euvm2
    parent: robertc at robertcollins.net-20080302191122-1ka40w2ikhf621by
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-04-04 06:59:43 +0100
    message:
      (robertc) Add errors needed for branch stacking support. (Robert
      	Collins)
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
        ------------------------------------------------------------
        revno: 3221.3.9
        revision-id: robertc at robertcollins.net-20080302191122-1ka40w2ikhf621by
        parent: robertc at robertcollins.net-20080227113225-xaryqdk37m9pys8j
        parent: robertc at robertcollins.net-20080228163138-79rgg8thdml9l2zd
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: errors
        timestamp: Mon 2008-03-03 06:11:22 +1100
        message:
          NEWS update.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3221.3.8
        revision-id: robertc at robertcollins.net-20080227113225-xaryqdk37m9pys8j
        parent: robertc at robertcollins.net-20080221225343-lp5xf6hl5g91088a
        parent: robertc at robertcollins.net-20080227022115-cmtkxjtvcp9qjn3r
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: errors
        timestamp: Wed 2008-02-27 22:32:25 +1100
        message:
          Merge bzr.dev.
        removed:
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-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/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          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_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3221.3.7
        revision-id: robertc at robertcollins.net-20080221225343-lp5xf6hl5g91088a
        parent: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
        parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: errors
        timestamp: Fri 2008-02-22 09:53:43 +1100
        message:
          Merge bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3221.3.6
        revision-id: robertc at robertcollins.net-20080220002317-5bdinlaczri004x2
        parent: robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: errors
        timestamp: Wed 2008-02-20 11:23:17 +1100
        message:
          Port across errors for shallow branch support.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
    ------------------------------------------------------------
    revno: 3316.2.17
    revision-id: pqm at pqm.ubuntu.com-20080404040539-d5h9wmdw179euvm2
    parent: pqm at pqm.ubuntu.com-20080404013911-s5ozllh7002ymmdt
    parent: robertc at robertcollins.net-20080404004307-0whomfhm3yal2rvw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-04-04 05:05:39 +0100
    message:
      (robertc) switch now looks up branch names relative to the branch of
      	a checkout, as well as from the current working dir. (Robert Collins,
      	Jelmer Vernooij, Wouter van Heyst)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
        ------------------------------------------------------------
        revno: 3246.5.2
        revision-id: robertc at robertcollins.net-20080404004307-0whomfhm3yal2rvw
        parent: robertc at robertcollins.net-20080303113547-h2gg8asygpg60uun
        parent: pqm at pqm.ubuntu.com-20080403080121-tbx3clqp8wqe776c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: switch-relative
        timestamp: Fri 2008-04-04 11:43:07 +1100
        message:
          Resolve conflicts.
        added:
          bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
          bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
          bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
          bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
          bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
          bzrlib/transport/nosmart.py    nosmart.py-20080402095843-6ib17idympwy1zkr-1
          doc/en/admin-guide/            docenadminguide-20080305135054-y7y2c986yf94zljn-1
          doc/en/admin-guide/index.txt   index.txt-20080305140741-ecw0lap8dxkxc05g-1
        renamed:
          bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
          bzrlib/_knit_load_data_py.py   _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          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/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/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/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-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/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/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          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/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-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/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          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_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_merge3.py    merge3.py-20050704130834-556689114c89e6f2
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          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_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          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_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
          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_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          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/test_wsgi.py      test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
          bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/chroot.py     chroot.py-20061011104729-0us9mgm97z378vnt-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
          bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
          bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/lca-merge.txt   lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          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/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          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/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
          doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        ------------------------------------------------------------
        revno: 3246.5.1
        revision-id: robertc at robertcollins.net-20080303113547-h2gg8asygpg60uun
        parent: pqm at pqm.ubuntu.com-20080229011300-p50it0si2y8mbv0d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: switch-relative
        timestamp: Mon 2008-03-03 22:35:47 +1100
        message:
          * ``bzr switch`` will attempt to find branches to switch to relative to the
            current branch. E.g. ``bzr switch branchname`` will look for
            ``current_branch/../branchname``. (Robert Collins, Jelmer Vernooij,
            Wouter van Heyst)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
    ------------------------------------------------------------
    revno: 3316.2.16
    revision-id: pqm at pqm.ubuntu.com-20080404013911-s5ozllh7002ymmdt
    parent: pqm at pqm.ubuntu.com-20080403080121-tbx3clqp8wqe776c
    parent: robertc at robertcollins.net-20080404000223-m270i246sp9uatmt
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-04-04 02:39:11 +0100
    message:
      (robertc) Remove VersionedFile.create_empty - it is incompatible with
      	stacking api needs. (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b

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



More information about the bazaar-commits mailing list