Rev 3316: merge bzr.dev in file:///v/home/vila/src/bzr/experimental/faster-selftest/

Vincent Ladeuil v.ladeuil+lp at free.fr
Wed Mar 26 21:51:48 GMT 2008


At file:///v/home/vila/src/bzr/experimental/faster-selftest/

------------------------------------------------------------
revno: 3316
revision-id: v.ladeuil+lp at free.fr-20080326215139-eyq1aui1ivgz8nn7
parent: v.ladeuil+lp at free.fr-20080324220432-97fus0xwqm7fg3jj
parent: v.ladeuil+lp at free.fr-20080326214440-hvwb7zsfp827m3lq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Wed 2008-03-26 22:51:39 +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/plugin.py               plugin.py-20050622060424-829b654519533d69
  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/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/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_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  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: 3313.1.9
    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: 3308.1.7
        revision-id: v.ladeuil+lp at free.fr-20080326214357-q0b9195s9qqfc2pw
        parent: v.ladeuil+lp at free.fr-20080326081001-akh733lcdhiep83b
        parent: v.ladeuil+lp at free.fr-20080326214331-khydifx3q86yqgqm
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: test-suite-refactoring
        timestamp: Wed 2008-03-26 22:43:57 +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: 3306.1.2
        revision-id: v.ladeuil+lp at free.fr-20080326214331-khydifx3q86yqgqm
        parent: v.ladeuil+lp at free.fr-20080324191209-23lppe6oqc0ef4kh
        parent: v.ladeuil+lp at free.fr-20080326214255-02rhczp1uixzhvsm
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: test-suite-fixes
        timestamp: Wed 2008-03-26 22:43:31 +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.1.2
        revision-id: v.ladeuil+lp at free.fr-20080326214255-02rhczp1uixzhvsm
        parent: v.ladeuil+lp at free.fr-20080324191104-uq1uc3tscb1det4x
        parent: v.ladeuil+lp at free.fr-20080326214222-5gspw57afbmyff7e
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: check-id-filtering
        timestamp: Wed 2008-03-26 22:42:55 +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.6.1
        revision-id: v.ladeuil+lp at free.fr-20080326214222-5gspw57afbmyff7e
        parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
        parent: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr-dev
        timestamp: Wed 2008-03-26 22:42:22 +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.3.6
        revision-id: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
        parent: pqm at pqm.ubuntu.com-20080326064729-bqj793c8y2dk8v4b
        parent: andrew.bennetts at canonical.com-20080326111518-yuuovnryy7srlzpl
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-03-26 12:48:29 +0000
        message:
          Reduce memory consumption of the test suite by resetting the __dict__
          	of successful TestCases. (Andrew Bennetts)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
            ------------------------------------------------------------
            revno: 3224.4.9
            revision-id: andrew.bennetts at canonical.com-20080326111518-yuuovnryy7srlzpl
            parent: andrew.bennetts at canonical.com-20080326101245-fkocwgvpebr1z5bd
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Wed 2008-03-26 22:15:18 +1100
            message:
              Add _TestCase__testMethodName to attrs_to_keep, for compatibility with Python 2.4.
            modified:
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
            ------------------------------------------------------------
            revno: 3224.4.8
            revision-id: andrew.bennetts at canonical.com-20080326101245-fkocwgvpebr1z5bd
            parent: andrew.bennetts at canonical.com-20080315204208-395u187l2rosmew1
            parent: pqm at pqm.ubuntu.com-20080326030652-vgwdkwda9mi8s200
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Wed 2008-03-26 21:12:45 +1100
            message:
              Merge bzr.dev
            added:
              bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
            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/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/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
              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/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
              bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
              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/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_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
              bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
              bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
              bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
              bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
              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_commit.py    test_commit.py-20050914060732-279f057f8c295434
              bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
              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_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
              bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
              bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
              bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
              bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
              bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
              bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
              bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
              bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
              bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
              bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
              bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
              bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
              bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
              bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
              bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
            ------------------------------------------------------------
            revno: 3224.4.7
            revision-id: andrew.bennetts at canonical.com-20080315204208-395u187l2rosmew1
            parent: andrew.bennetts at canonical.com-20080315203930-67etm23yidlyw7ol
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Sat 2008-03-15 15:42:08 -0500
            message:
              Add NEWS entry.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3224.4.6
            revision-id: andrew.bennetts at canonical.com-20080315203930-67etm23yidlyw7ol
            parent: andrew.bennetts at canonical.com-20080315203634-6ygciatnq3hjowv4
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Sat 2008-03-15 15:39:30 -0500
            message:
              Tweak another _log_contents clearing.
            modified:
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
            ------------------------------------------------------------
            revno: 3224.4.5
            revision-id: andrew.bennetts at canonical.com-20080315203634-6ygciatnq3hjowv4
            parent: andrew.bennetts at canonical.com-20080315203546-l0r56fy9aer1th9i
            parent: pqm at pqm.ubuntu.com-20080315174441-l8xpw6femn0syal1
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Sat 2008-03-15 15:36:34 -0500
            message:
              Merge from bzr.dev.
            added:
              bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
              bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
              bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
              bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1
              bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
              bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
              bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
              bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
              bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
              bzrlib/tests/test_merge3.py    merge3.py-20050704130834-556689114c89e6f2
              bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
              bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
              bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
              bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
              doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
              doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
              doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
            ------------------------------------------------------------
            revno: 3224.4.4
            revision-id: andrew.bennetts at canonical.com-20080315203546-l0r56fy9aer1th9i
            parent: andrew.bennetts at canonical.com-20080314150130-ai4axmu8wx4doc4s
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Sat 2008-03-15 15:35:46 -0500
            message:
              Tweak clearing of _log_contents (idea from John).
            modified:
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
            ------------------------------------------------------------
            revno: 3224.4.3
            revision-id: andrew.bennetts at canonical.com-20080314150130-ai4axmu8wx4doc4s
            parent: andrew.bennetts at canonical.com-20080314145907-c2avcip1jcqlk77d
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Fri 2008-03-14 10:01:30 -0500
            message:
              Rename 'not_found' marker to 'absent_attr'.
            modified:
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
            ------------------------------------------------------------
            revno: 3224.4.2
            revision-id: andrew.bennetts at canonical.com-20080314145907-c2avcip1jcqlk77d
            parent: andrew.bennetts at canonical.com-20080219012302-89l9om1golof6ka0
            parent: pqm at pqm.ubuntu.com-20080313082937-sc9ovcwq3r10sjqd
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Fri 2008-03-14 09:59:07 -0500
            message:
              Merge from bzr.dev.
            removed:
              index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
            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/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
              doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
              doc/en/admin-guide/            docenadminguide-20080305135054-y7y2c986yf94zljn-1
              doc/en/admin-guide/index.txt   index.txt-20080305140741-ecw0lap8dxkxc05g-1
              tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-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
            modified:
              .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
              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/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
              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/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
              bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
              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/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
              bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
              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/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/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
              bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
              bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
              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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
              bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
              bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
              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/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
              bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
              bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
              bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
              bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
              bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
              bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
              bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
              bzrlib/tests/test_merge_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_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
              bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              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_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_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
              bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
              bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
              bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
              bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-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/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
              bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
              bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
              bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
              bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
              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_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
              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/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/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
              tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
              bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
              bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
            ------------------------------------------------------------
            revno: 3224.4.1
            revision-id: andrew.bennetts at canonical.com-20080219012302-89l9om1golof6ka0
            parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: test-suite-memory-reduction
            timestamp: Tue 2008-02-19 12:23:02 +1100
            message:
              Prune __dict__ of TestCases after they have run to save memory.
            modified:
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.3.5
        revision-id: pqm at pqm.ubuntu.com-20080326064729-bqj793c8y2dk8v4b
        parent: pqm at pqm.ubuntu.com-20080326030652-vgwdkwda9mi8s200
        parent: jelmer at samba.org-20080326043739-wdntqvpex3m0g6h2
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-03-26 06:47:29 +0000
        message:
          (Jelmer) Set inventory_sha1 in Repository.add_revision() if inventory
          	is specified.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
            ------------------------------------------------------------
            revno: 3302.5.1
            revision-id: jelmer at samba.org-20080326043739-wdntqvpex3m0g6h2
            parent: pqm at pqm.ubuntu.com-20080326003617-r5xl8b8d6dqqor3w
            committer: Jelmer Vernooij <jelmer at samba.org>
            branch nick: bzr.dev
            timestamp: Wed 2008-03-26 05:37:39 +0100
            message:
              Make sure that specifying the inv= argument to add_revision() sets the 
              inventory_sha1 for the revision correctly.
            modified:
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
        ------------------------------------------------------------
        revno: 3302.3.4
        revision-id: pqm at pqm.ubuntu.com-20080326030652-vgwdkwda9mi8s200
        parent: pqm at pqm.ubuntu.com-20080326003617-r5xl8b8d6dqqor3w
        parent: robertc at robertcollins.net-20080326012515-qwyqj05bbhnm8uxz
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-03-26 03:06:52 +0000
        message:
          Deprecate VersionedFile.get_parents. (Robert Collins)
        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/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          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/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/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          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
            ------------------------------------------------------------
            revno: 3287.5.10
            revision-id: robertc at robertcollins.net-20080326012515-qwyqj05bbhnm8uxz
            parent: robertc at robertcollins.net-20080326011541-h9cxdap8x5pafq13
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: integration
            timestamp: Wed 2008-03-26 12:25:15 +1100
            message:
              Note iter_reverse_revision_history exception decision.
            modified:
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 3287.5.9
            revision-id: robertc at robertcollins.net-20080326011541-h9cxdap8x5pafq13
            parent: robertc at robertcollins.net-20080325040051-fz86q4klex5dngfi
            parent: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Wed 2008-03-26 12:15:41 +1100
            message:
              Merge bzr.dev.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
            ------------------------------------------------------------
            revno: 3287.5.8
            revision-id: robertc at robertcollins.net-20080325040051-fz86q4klex5dngfi
            parent: robertc at robertcollins.net-20080325005216-ddeb2l154nd40dkq
            parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Tue 2008-03-25 15:00:51 +1100
            message:
              Merge up bzr.dev.
            added:
              bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
              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/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
              bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
              bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
              bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
              bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
              bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
            ------------------------------------------------------------
            revno: 3287.5.7
            revision-id: robertc at robertcollins.net-20080325005216-ddeb2l154nd40dkq
            parent: robertc at robertcollins.net-20080320013104-3wg168d1kqn9v10n
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Tue 2008-03-25 11:52:16 +1100
            message:
              Bugfix error raising in weaves for msising revisions.
            modified:
              bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
            ------------------------------------------------------------
            revno: 3287.5.6
            revision-id: robertc at robertcollins.net-20080320013104-3wg168d1kqn9v10n
            parent: robertc at robertcollins.net-20080320004325-ee5fzf6ax6cmjgfx
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Thu 2008-03-20 12:31:04 +1100
            message:
              Remove _KnitIndex.get_parents.
            modified:
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
            ------------------------------------------------------------
            revno: 3287.5.5
            revision-id: robertc at robertcollins.net-20080320004325-ee5fzf6ax6cmjgfx
            parent: robertc at robertcollins.net-20080319044803-nrd67fw9e9786k3f
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Thu 2008-03-20 11:43:25 +1100
            message:
              Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
            modified:
              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/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
              bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
              bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
            ------------------------------------------------------------
            revno: 3287.5.4
            revision-id: robertc at robertcollins.net-20080319044803-nrd67fw9e9786k3f
            parent: robertc at robertcollins.net-20080319044605-m3r45azfimef9mf6
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Wed 2008-03-19 15:48:03 +1100
            message:
              Bump the deprecation to 1.4.
            modified:
              bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
              bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
            ------------------------------------------------------------
            revno: 3287.5.3
            revision-id: robertc at robertcollins.net-20080319044605-m3r45azfimef9mf6
            parent: robertc at robertcollins.net-20080319043904-7g4imzvybc7q9l8h
            parent: pqm at pqm.ubuntu.com-20080318200038-jo7mqokvib9aojt9
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Wed 2008-03-19 15:46:05 +1100
            message:
              Merge bzr.dev.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzr                            bzr.py-20050313053754-5485f144c7006fa6
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
              bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
              bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
              bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
              bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
              bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
              bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
              bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
            ------------------------------------------------------------
            revno: 3287.5.2
            revision-id: robertc at robertcollins.net-20080319043904-7g4imzvybc7q9l8h
            parent: robertc at robertcollins.net-20080318011335-oq6210j5dgu9rz7d
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Wed 2008-03-19 15:39:04 +1100
            message:
              Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
              bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              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/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/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
              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
            ------------------------------------------------------------
            revno: 3287.5.1
            revision-id: robertc at robertcollins.net-20080318011335-oq6210j5dgu9rz7d
            parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: versionedfile.apicleanup
            timestamp: Tue 2008-03-18 12:13:35 +1100
            message:
              Add VersionedFile.get_parent_map.
            modified:
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              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.3.3
        revision-id: pqm at pqm.ubuntu.com-20080326003617-r5xl8b8d6dqqor3w
        parent: pqm at pqm.ubuntu.com-20080325083430-0w0gjtnkegce7718
        parent: andrew.bennetts at canonical.com-20080325225322-ts3wqjjhnpoorb8c
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-03-26 00:36:17 +0000
        message:
          Add -Dselftest_debug debug flag. (Andrew Bennetts)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
            ------------------------------------------------------------
            revno: 3302.4.2
            revision-id: andrew.bennetts at canonical.com-20080325225322-ts3wqjjhnpoorb8c
            parent: andrew.bennetts at canonical.com-20080325071650-0hk9sdqc2au97xkg
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: selftest-debug-flags
            timestamp: Wed 2008-03-26 09:53:22 +1100
            message:
              Add -Dselftest_debug to bzrlib/help_topics/__init__.py.
            modified:
              bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
            ------------------------------------------------------------
            revno: 3302.4.1
            revision-id: andrew.bennetts at canonical.com-20080325071650-0hk9sdqc2au97xkg
            parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: selftest-debug-flags
            timestamp: Tue 2008-03-25 18:16:50 +1100
            message:
              Add -Dselftest_debug debug flag.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 3302.3.2
        revision-id: pqm at pqm.ubuntu.com-20080325083430-0w0gjtnkegce7718
        parent: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
        parent: aaron at aaronbentley.com-20080325054055-se4iycu8hm71i1db
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Tue 2008-03-25 08:34:30 +0000
        message:
          Allow pulling from lp: urls (abentley, #181945)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
            ------------------------------------------------------------
            revno: 3251.4.12
            revision-id: aaron at aaronbentley.com-20080325054055-se4iycu8hm71i1db
            parent: aaron at aaronbentley.com-20080325012528-mk25xr8eh1uomdyn
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: pull-lp
            timestamp: Tue 2008-03-25 01:40:55 -0400
            message:
              Updates from review
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
              bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
            ------------------------------------------------------------
            revno: 3251.4.11
            revision-id: aaron at aaronbentley.com-20080325012528-mk25xr8eh1uomdyn
            parent: aaron at aaronbentley.com-20080324234351-53hoobvvh6n6nb5v
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: lp-service
            timestamp: Mon 2008-03-24 21:25:28 -0400
            message:
              Fix wrong local lookups
            modified:
              bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
              bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
              bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
            ------------------------------------------------------------
            revno: 3251.4.10
            revision-id: aaron at aaronbentley.com-20080324234351-53hoobvvh6n6nb5v
            parent: aaron at aaronbentley.com-20080324212506-irctyrxto9u4h0xi
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: lp-service
            timestamp: Mon 2008-03-24 19:43:51 -0400
            message:
              Pull of launchpad locations works (abentley, #181945)
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
              bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
              bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
            ------------------------------------------------------------
            revno: 3251.4.9
            revision-id: aaron at aaronbentley.com-20080324212506-irctyrxto9u4h0xi
            parent: aaron at aaronbentley.com-20080307135143-v84thnmby9tllh70
            parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: lp-service
            timestamp: Mon 2008-03-24 17:25:06 -0400
            message:
              Merge with bzr.dev
            added:
              bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
              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
              doc/en/admin-guide/            docenadminguide-20080305135054-y7y2c986yf94zljn-1
              doc/en/admin-guide/index.txt   index.txt-20080305140741-ecw0lap8dxkxc05g-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              README                         README-20050309040720-8f368abf9f346b9d
              bzr                            bzr.py-20050313053754-5485f144c7006fa6
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
              bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              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/errors.py               errors.py-20050309040759-20512168c4e14fbd
              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/plugin.py               plugin.py-20050622060424-829b654519533d69
              bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
              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/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
              bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
              bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
              bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
              bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
              bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
              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_push.py test_push.py-20060329002750-929af230d5d22663
              bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
              bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
              bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
              bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
              bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
              bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
              bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
              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_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
              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_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              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_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-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/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
              bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-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/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/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
              doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
              doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
              doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
              setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3302.3.1
        revision-id: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
        parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
        parent: aaron at aaronbentley.com-20080325052538-kvkms30yiknobig7
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Tue 2008-03-25 07:01:04 +0000
        message:
          Optimize log --short/--line in the common case (abentley)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3302.2.5
        revision-id: aaron at aaronbentley.com-20080325052538-kvkms30yiknobig7
        parent: aaron at aaronbentley.com-20080324142315-e18xe0xgur76xbql
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: show_log
        timestamp: Tue 2008-03-25 01:25:38 -0400
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3302.2.4
        revision-id: aaron at aaronbentley.com-20080324142315-e18xe0xgur76xbql
        parent: aaron at aaronbentley.com-20080324142038-kve58bcu069f6z58
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fast-log
        timestamp: Mon 2008-03-24 10:23:15 -0400
        message:
          Return revno as a string
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3302.2.3
        revision-id: aaron at aaronbentley.com-20080324142038-kve58bcu069f6z58
        parent: aaron at aaronbentley.com-20080324140320-l46lss2a0khz9iqt
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fast-log
        timestamp: Mon 2008-03-24 10:20:38 -0400
        message:
          Add optimization of the simple case of generating view revisions
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3302.2.2
        revision-id: aaron at aaronbentley.com-20080324140320-l46lss2a0khz9iqt
        parent: aaron at aaronbentley.com-20080324132642-fddmh8rwk9py3uxm
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fast-log
        timestamp: Mon 2008-03-24 10:03:20 -0400
        message:
          Split out the major view_revision calculation logic
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 3302.2.1
        revision-id: aaron at aaronbentley.com-20080324132642-fddmh8rwk9py3uxm
        parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: fast-log
        timestamp: Mon 2008-03-24 09:26:42 -0400
        message:
          Split out _iter_revision, allow view_revisions to be an iterator
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
    ------------------------------------------------------------
    revno: 3313.1.8
    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: 3313.1.7
    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: 3313.1.6
    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: 3313.1.5
    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: 3313.1.4
    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: 3313.1.3
    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: 3308.1.6
    revision-id: v.ladeuil+lp at free.fr-20080326081001-akh733lcdhiep83b
    parent: v.ladeuil+lp at free.fr-20080324220159-1d3l3niap11l5bhi
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: test-suite-refactoring
    timestamp: Wed 2008-03-26 09:10:01 +0100
    message:
      Fix typos.
      
      * bzrlib/tests/test_selftest.py:
      (TestTestLoader.test_load_tests_from_module_name_with_bogus_module_name):
      Fix typo.
      
      * bzrlib/tests/TestUtil.py:
      (TestLoader.getTestCaseNames): Fix typo.
    modified:
      bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
-------------- next part --------------

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


More information about the bazaar-commits mailing list