Rev 2778: Fix some inconsistent NEWS indents. in http://people.ubuntu.com/~robertc/baz2.0/integration

Robert Collins robertc at robertcollins.net
Tue Sep 4 00:19:22 BST 2007


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

------------------------------------------------------------
revno: 2778
revision-id: robertc at robertcollins.net-20070903231900-j3or8vkiixxpskzm
parent: robertc at robertcollins.net-20070903043134-k1w3zs0se7psbuoh
parent: pqm at pqm.ubuntu.com-20070903211907-igj2uj83hz1yyqs9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-09-04 09:19:00 +1000
message:
  Fix some inconsistent NEWS indents.
added:
  bzrlib/tests/inventory_implementations/ bzrlibtestsinventory-20070820060653-4mjbbmwhp74dsf3x-1
  bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
  bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
  doc/developers/missing.txt     missing.txt-20070718093412-eqjvfwo0oacov5sn-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
  bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
  bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
  bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
  doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
  doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
  doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
  doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
    ------------------------------------------------------------
    revno: 2776.1.15
    revision-id: pqm at pqm.ubuntu.com-20070903211907-igj2uj83hz1yyqs9
    parent: pqm at pqm.ubuntu.com-20070903130729-qdcrag0a7vcpzfgm
    parent: robertc at robertcollins.net-20070903202305-yj4obhvvw3j7t4jc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 22:19:07 +0100
    message:
      (robertc) Don't double-calculate the text sha1 during commit. (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
        ------------------------------------------------------------
        revno: 2776.2.3
        revision-id: robertc at robertcollins.net-20070903202305-yj4obhvvw3j7t4jc
        parent: robertc at robertcollins.net-20070903030326-xam93hxlthc6l37w
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit
        timestamp: Tue 2007-09-04 06:23:05 +1000
        message:
          Missed bundles in the return value conversion of vf.add_lines.
        modified:
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2776.2.2
        revision-id: robertc at robertcollins.net-20070903030326-xam93hxlthc6l37w
        parent: robertc at robertcollins.net-20070903025858-k2pxq3qz6ulhhtgq
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit
        timestamp: Mon 2007-09-03 13:03:26 +1000
        message:
          Don't double-calculate the text sha1 during commit.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2776.2.1
        revision-id: robertc at robertcollins.net-20070903025858-k2pxq3qz6ulhhtgq
        parent: pqm at pqm.ubuntu.com-20070901160444-hcr66zejwyy0jezc
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit
        timestamp: Mon 2007-09-03 12:58:58 +1000
        message:
           * The ``add_lines`` methods on ``VersionedFile`` implementations has changed
             its return value to include the sha1 and length of the inserted text. This
             allows the avoidance of double-sha1 calculations during commit.
             (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    revno: 2776.1.14
    revision-id: pqm at pqm.ubuntu.com-20070903130729-qdcrag0a7vcpzfgm
    parent: pqm at pqm.ubuntu.com-20070903110923-pj5pw0wsf1u922j9
    parent: ian.clatworthy at internode.on.net-20070903123214-kgrq7hubbtkmkn7i
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 14:07:29 +0100
    message:
      (Nam Nguyen) Pre-commit hook
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
      bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
      bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
      doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
        ------------------------------------------------------------
        revno: 2776.1.13.1.1
        revision-id: ian.clatworthy at internode.on.net-20070903123214-kgrq7hubbtkmkn7i
        parent: pqm at pqm.ubuntu.com-20070903110923-pj5pw0wsf1u922j9
        parent: nguyen at guy-20070902053708-hjup9c46zj1jxml1
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration
        timestamp: Mon 2007-09-03 22:32:14 +1000
        message:
          (Nam Nguyen) Pre-commit hook
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
        ------------------------------------------------------------
        revno: 2659.3.10
        revision-id: nguyen at guy-20070902053708-hjup9c46zj1jxml1
        parent: namnguyen-20070827083837-t6a5oewzvdct6j8i
        parent: pqm at pqm.ubuntu.com-20070901160444-hcr66zejwyy0jezc
        committer: Nam Nguyen <Nam Nguyen at GUY>
        branch nick: precommit
        timestamp: Sun 2007-09-02 13:37:08 +0800
        message:
          merge with bzr.dev and update hooks.txt to list pre_commit hook.
          
          doc/en/user-reference/hooks.txt:
          
             * added a section for pre_commit_hook
        added:
          doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
          doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
          bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
          tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
        ------------------------------------------------------------
        revno: 2659.3.9
        revision-id: namnguyen-20070827083837-t6a5oewzvdct6j8i
        parent: namnguyen-20070827032116-11p0vjw01wn4l53y
        committer: NamNguyen
        branch nick: precommit
        timestamp: Mon 2007-08-27 16:38:37 +0800
        message:
          branch.py:
          
             * ``pre_commit`` hook's signature is changed to::
          
             hook(local, master, old_revno, old_revid, future_revno, future_revid,
                  tree_delta, future_tree)
          
             * made it clear that pre_commit hooks must not modify neither
               the delta nor future_tree
          
          commit.py:
          
             * replaced ``affected_ids`` with ``tree_delta``
          
             * only compute ``future_tree`` and ``tree_delta`` once
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 2659.3.8
        revision-id: namnguyen-20070827032116-11p0vjw01wn4l53y
        parent: namnguyen-20070815091606-2gqalm977ys9e21w
        parent: pqm at pqm.ubuntu.com-20070825182243-a3w20rpadbfz8euc
        committer: NamNguyen
        branch nick: precommit
        timestamp: Mon 2007-08-27 11:21:16 +0800
        message:
          merge with bzr.dev
        removed:
          doc/README.1st                 README.1st-20060314161707-b943d5d4cce669b6
          doc/developers/scratch.txt     scratch.txt-20070618020404-cdhv0ecgrukomemg-3
        added:
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/util/simplemapi.py      simplemapi.py-20070810174811-ievl23nziuiq2k3m-1
          doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
          doc/developers/last-modified.txt lastmodified.txt-20070806222243-df50y5fi7n85vnob-1
          doc/developers/revision-properties.txt revisionproperties.t-20070807133526-w57m8zv5o7t5kugm-1
          doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
          doc/en/                        en-20070810050627-g7r46azs5mlwj61j-1
          doc/en/developer-guide/        developerguide-20070810050627-g7r46azs5mlwj61j-2
          doc/en/mini-tutorial/          minitutorial-20070813141352-2u64ooqzo0or4hss-1
          doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
          doc/en/quick-reference/        quickreference-20070813143223-5i7bgw7w8s7l3ae2-1
          doc/en/quick-reference/Makefile makefile-20070813143223-5i7bgw7w8s7l3ae2-2
          doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
          doc/en/release-notes/          releasenotes-20070810050627-g7r46azs5mlwj61j-3
          doc/en/user-guide/             userguide-20070810050627-g7r46azs5mlwj61j-4
          doc/en/user-reference/         userreference-20070810050627-g7r46azs5mlwj61j-5
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
        renamed:
          doc/bug_trackers.txt => doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/centralized_workflow.txt => doc/en/user-guide/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
          doc/configuration.txt => doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
          doc/conflicts.txt => doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
          doc/http_smart_server.txt => doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/index.txt => doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/plugins.txt => doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
          doc/server.txt => doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
          doc/setting_up_email.txt => doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
          doc/shared_repository_layouts.txt => doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
          doc/specifying_revisions.txt => doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
          doc/tutorial.txt => doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
          doc/using_aliases.txt => doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
          doc/version_info.txt => doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          INSTALL                        INSTALL-20051019070340-4b27f2fb240c7943
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
          bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
          bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
          bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
          bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
          bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
          bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
          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_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
          bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          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/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
          bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
          bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
          bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
          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/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/fakevfat.py   fakevfat.py-20060407072414-d59939fa1d6c79d9
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/wsgi.py  wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
          bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/bazaar-vcs.org.kid         bazaarvcs.org.kid-20060929181918-huv7bgmdey0ktqci-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
          doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/rst2prettyhtml.py        rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
          tools/win32/ostools.py         ostools.py-20060731163025-npjffm46rgnkl50d-1
          doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
        ------------------------------------------------------------
        revno: 2659.3.7
        revision-id: namnguyen-20070815091606-2gqalm977ys9e21w
        parent: namnguyen-20070815090632-w0xcl6t5if19m2oj
        committer: NamNguyen
        branch nick: precommit
        timestamp: Wed 2007-08-15 17:16:06 +0800
        message:
          NEWS:
          
            * Pull the NEWS entry to IN DEVELOPMENT
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2659.3.6
        revision-id: namnguyen-20070815090632-w0xcl6t5if19m2oj
        parent: namnguyen-20070815074942-rd91twf3wm3enomx
        committer: NamNguyen
        branch nick: precommit
        timestamp: Wed 2007-08-15 17:06:32 +0800
        message:
          branch_implementations/test_commit.py:
          
            * renamed test_pre_commit_paths to test_pre_commit_ids
            * added cases for ``added``, ``deleted``, ``renamed``, ``modified``, and
              ``modified and renamed``
        modified:
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
        ------------------------------------------------------------
        revno: 2659.3.5
        revision-id: namnguyen-20070815074942-rd91twf3wm3enomx
        parent: namnguyen-20070807082534-7xw955iabtlxuayj
        parent: pqm at pqm.ubuntu.com-20070815055603-t0fwzxv6if6sr7c6
        committer: NamNguyen
        branch nick: precommit
        timestamp: Wed 2007-08-15 15:49:42 +0800
        message:
          merge with bzr.dev
        removed:
          bzrlib/file_names.py           file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
          bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
        added:
          bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
          tools/win32/survey.txt         survey.txt-20070809075950-sf265mgu9oog8jjb-1
        renamed:
          doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smtp_connection.py      smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
          bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-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_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
          bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
          doc/developers/bundles.txt     bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/profiling.txt   profiling.txt-20070531045713-j15mxufywgzwdeu8-1
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/http_smart_server.txt      fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/index.txt                  index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
          tools/rst2html.py              rst2html.py-20060817120932-gn177u8v0008txhu-1
          tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2659.3.4
        revision-id: namnguyen-20070807082534-7xw955iabtlxuayj
        parent: namnguyen-20070807082328-6i934n9gdj5fd17a
        parent: pqm at pqm.ubuntu.com-20070807061316-b32atzzop4r4y21g
        committer: NamNguyen
        branch nick: precommit
        timestamp: Tue 2007-08-07 16:25:34 +0800
        message:
          merged with bzr.dev
        added:
          bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
          bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
          bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          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/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          doc/index.txt                  index.txt-20060622101119-tgwtdci8z769bjb9-2
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
          tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
        ------------------------------------------------------------
        revno: 2659.3.3
        revision-id: namnguyen-20070807082328-6i934n9gdj5fd17a
        parent: namnguyen-20070801063025-pb139zkmbuwg5ga6
        parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
        committer: NamNguyen
        branch nick: precommit
        timestamp: Tue 2007-08-07 16:23:28 +0800
        message:
          Changed ``pre_commit`` hook signature.
          
          The hook's signature is now
          
            ::
          
              hook(local, master, old_revno, old_revid, new_revno, new_revid,
                   affected_ids, future_revision_tree)
          
          ``affected_ids`` is a dictionary of (change_type, ids). change_type is
          a string describing the change (e.g. 'added', 'deleted', 'modified'), and
          ids is a list of inventory entry ids.
          
          Hooks can get an added file easier than before:
          
            ::
          
              for id in affected_ids.get('added', []):
                  if future_revision_tree.kind(id) == 'file':
                      file = future_revision_tree.get_file(id)
                      ...
        renamed:
          bzrlib/tests/blackbox/test_submit.py => bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
        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/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
          bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
        ------------------------------------------------------------
        revno: 2659.3.2
        revision-id: namnguyen-20070801063025-pb139zkmbuwg5ga6
        parent: namnguyen-20070801061414-u0tzrfgcz6z604lz
        committer: NamNguyen
        branch nick: precommit
        timestamp: Wed 2007-08-01 14:30:25 +0800
        message:
          Fix NEWS entry of the last commit.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2659.3.1
        revision-id: namnguyen-20070801061414-u0tzrfgcz6z604lz
        parent: pqm at pqm.ubuntu.com-20070730051419-0jdj7g8fm4iuoz7h
        committer: NamNguyen
        branch nick: precommit
        timestamp: Wed 2007-08-01 14:14:14 +0800
        message:
          ``Branch.hooks`` now supports ``pre_commit`` hook.
          
          The hook's signature is
          
          ::
          
            hook(local, master, old_revno, old_revid, new_revno, new_revid,
                 deleted_paths, added_paths, future_revision_tree)
          
          ``deleted_paths`` and ``added_paths`` are lists of paths. Renamed paths are
          recorded in both ``deleted_paths`` and ``added_paths`` (i.e. deleted then
          added).
          
          ``future_revision_tree`` is obtained from ``CommitBuilder.revision_tree``
          to save hooks from getting it from the branch again.
          
          For example, hooks can get a file:
          
          ::
          
            for path in added_paths:
                id = future_revision_tree.path2id(path)
                if future_revision_tree.kind(id) == 'file':
                    file = future_revision_tree.get_file(id)
                    ...
          
          or export a tree and do ``make check`` or similar
          
          ::
          
            import bzrlib.export
            bzrlib.export.export(future_revision_tree, 'tmp_space')
          
          
          If the commit is to be rejected, hooks should raise an ``Exception``.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
    ------------------------------------------------------------
    revno: 2776.1.13
    revision-id: pqm at pqm.ubuntu.com-20070903110923-pj5pw0wsf1u922j9
    parent: pqm at pqm.ubuntu.com-20070903101735-al3ficqurndkv49i
    parent: bialix at ukr.net-20070903091013-vn3j45aq5a0jeyeu
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 12:09:23 +0100
    message:
      (Vincent Ladeuil) Performance analysis of missing
    added:
      doc/developers/missing.txt     missing.txt-20070718093412-eqjvfwo0oacov5sn-1
    modified:
      doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
      doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
        ------------------------------------------------------------
        revno: 2776.1.2.5.1
        revision-id: bialix at ukr.net-20070903091013-vn3j45aq5a0jeyeu
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        parent: v.ladeuil+lp at free.fr-20070718094341-edmgsog3el06yqow
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: vila
        timestamp: Mon 2007-09-03 12:10:13 +0300
        message:
          merge with bzr.dev
        added:
          doc/developers/missing.txt     missing.txt-20070718093412-eqjvfwo0oacov5sn-1
        modified:
          doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
          doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
        ------------------------------------------------------------
        revno: 2625.10.1
        revision-id: v.ladeuil+lp at free.fr-20070718094341-edmgsog3el06yqow
        parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: missing.spec
        timestamp: Wed 2007-07-18 11:43:41 +0200
        message:
          Add performance analysis of missing.
        added:
          doc/developers/missing.txt     missing.txt-20070718093412-eqjvfwo0oacov5sn-1
        modified:
          doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
          doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
    ------------------------------------------------------------
    revno: 2776.1.12
    revision-id: pqm at pqm.ubuntu.com-20070903101735-al3ficqurndkv49i
    parent: pqm at pqm.ubuntu.com-20070903094621-g97i8i5qwal4x0er
    parent: ian.clatworthy at internode.on.net-20070903082334-yqbzwb83q0jbdb62
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 11:17:35 +0100
    message:
      (Daniel Watkins) Warn when a given ignore pattern matches existing versioned files
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
        ------------------------------------------------------------
        revno: 2776.1.8.1.1
        revision-id: ian.clatworthy at internode.on.net-20070903082334-yqbzwb83q0jbdb62
        parent: pqm at pqm.ubuntu.com-20070903080656-1sn8ea2d3ohx75ek
        parent: d.m.watkins at warwick.ac.uk-20070829094837-xunde9qmpsz8btru
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration
        timestamp: Mon 2007-09-03 18:23:34 +1000
        message:
          (Daniel Watkins) Warn when a given ignore pattern matches existing versioned files
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
        ------------------------------------------------------------
        revno: 2747.5.4
        revision-id: d.m.watkins at warwick.ac.uk-20070829094837-xunde9qmpsz8btru
        parent: d.m.watkins at warwick.ac.uk-20070828111427-pvr0d9bgjl515w1u
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: 48623
        timestamp: Wed 2007-08-29 11:48:37 +0200
        message:
          Added test showing that the warning lists only files matching the new glob, as per abentley's request.
        modified:
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
        ------------------------------------------------------------
        revno: 2747.5.3
        revision-id: d.m.watkins at warwick.ac.uk-20070828111427-pvr0d9bgjl515w1u
        parent: d.m.watkins at warwick.ac.uk-20070825124224-akgvn9cia1xkjac7
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: 48623
        timestamp: Tue 2007-08-28 13:14:27 +0200
        message:
          Modified to avoid encoding issues.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2747.5.2
        revision-id: d.m.watkins at warwick.ac.uk-20070825124224-akgvn9cia1xkjac7
        parent: d.m.watkins at warwick.ac.uk-20070825124159-mwkmk95iqc64vmyh
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: 48623
        timestamp: Sat 2007-08-25 14:42:24 +0200
        message:
          Added tests for new functionality.
        modified:
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
        ------------------------------------------------------------
        revno: 2747.5.1
        revision-id: d.m.watkins at warwick.ac.uk-20070825124159-mwkmk95iqc64vmyh
        parent: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: 48623
        timestamp: Sat 2007-08-25 14:41:59 +0200
        message:
          'ignore' now outputs a list of versioned files that match the given pattern.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2776.1.11
    revision-id: pqm at pqm.ubuntu.com-20070903094621-g97i8i5qwal4x0er
    parent: pqm at pqm.ubuntu.com-20070903091305-sz9xkqi13fr6cve0
    parent: d.m.watkins at warwick.ac.uk-20070825160625-txoybrl7wji18ipw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 10:46:21 +0100
    message:
      (dmwatkins) When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
        ------------------------------------------------------------
        revno: 2747.4.1
        revision-id: d.m.watkins at warwick.ac.uk-20070825160625-txoybrl7wji18ipw
        parent: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
        author: Konstantin Mikhaylov
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: 5454
        timestamp: Sat 2007-08-25 18:06:25 +0200
        message:
          When two plugins conflict, the source of both the losing and now the winning definition is shown, fixing bug #5454.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
    ------------------------------------------------------------
    revno: 2776.1.10
    revision-id: pqm at pqm.ubuntu.com-20070903091305-sz9xkqi13fr6cve0
    parent: pqm at pqm.ubuntu.com-20070903083917-b6n7swxr3yolv0ak
    parent: bialix at ukr.net-20070903062348-2qg3kroz814m2tcj
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 10:13:05 +0100
    message:
      (Daniel Watkins) Convert tests.blackbox.test_merge to use internals
       where appropriate
    modified:
      bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2776.1.2.4.1
        revision-id: bialix at ukr.net-20070903062348-2qg3kroz814m2tcj
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        parent: d.m.watkins at warwick.ac.uk-20070823175413-x5lmokcirkg57fzm
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: odd_bloke
        timestamp: Mon 2007-09-03 09:23:48 +0300
        message:
          merged with bzr.dev
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2738.3.4
        revision-id: d.m.watkins at warwick.ac.uk-20070823175413-x5lmokcirkg57fzm
        parent: d.m.watkins at warwick.ac.uk-20070823153939-hizvo3hib1xhmfjq
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: fix_blackbox_test_merge
        timestamp: Thu 2007-08-23 19:54:13 +0200
        message:
          Fixed tuple spacing.
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2738.3.3
        revision-id: d.m.watkins at warwick.ac.uk-20070823153939-hizvo3hib1xhmfjq
        parent: d.m.watkins at warwick.ac.uk-20070821131246-m8w0kwn21umvuj0e
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: fix_blackbox_test_merge
        timestamp: Thu 2007-08-23 17:39:39 +0200
        message:
          Minor reformatting per abentley's mailing list comments.
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2738.3.2
        revision-id: d.m.watkins at warwick.ac.uk-20070821131246-m8w0kwn21umvuj0e
        parent: d.m.watkins at warwick.ac.uk-20070821130211-gymr3b28f7jsnwgc
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: fix_blackbox_test_merge
        timestamp: Tue 2007-08-21 15:12:46 +0200
        message:
          Modified as per abentley's comments.
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2738.3.1
        revision-id: d.m.watkins at warwick.ac.uk-20070821130211-gymr3b28f7jsnwgc
        parent: pqm at pqm.ubuntu.com-20070821044713-ttnupbvhlsbwh1he
        parent: d.m.watkins at warwick.ac.uk-20070808015318-zejmehg0a82at5c7
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: fix_blackbox_test_merge
        timestamp: Tue 2007-08-21 15:02:11 +0200
        message:
          tests.blackbox.test_merge now uses internals where appropriate.
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2664.12.1
        revision-id: d.m.watkins at warwick.ac.uk-20070808015318-zejmehg0a82at5c7
        parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
        committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
        branch nick: fix-blackbox-tests
        timestamp: Wed 2007-08-08 02:53:18 +0100
        message:
          tests.blackbox.test_merge now uses internals where appropriate.
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
    ------------------------------------------------------------
    revno: 2776.1.9
    revision-id: pqm at pqm.ubuntu.com-20070903083917-b6n7swxr3yolv0ak
    parent: pqm at pqm.ubuntu.com-20070903080656-1sn8ea2d3ohx75ek
    parent: bialix at ukr.net-20070903060524-vr092u0pbnbh5rl5
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 09:39:17 +0100
    message:
      (James Westby) Fix the format string for ImmortalLimbo
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
        ------------------------------------------------------------
        revno: 2776.1.2.3.1
        revision-id: bialix at ukr.net-20070903060524-vr092u0pbnbh5rl5
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        parent: jw+debian at jameswestby.net-20070831204347-htk7tpdawmccafuk
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: james_w
        timestamp: Mon 2007-09-03 09:05:24 +0300
        message:
          merged with bzr.dev
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
        ------------------------------------------------------------
        revno: 2775.1.1
        revision-id: jw+debian at jameswestby.net-20070831204347-htk7tpdawmccafuk
        parent: pqm at pqm.ubuntu.com-20070831085255-w43drl9sistvl5dl
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev
        timestamp: Fri 2007-08-31 21:43:47 +0100
        message:
          Fix the format string for ImmortalLimbo.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
    ------------------------------------------------------------
    revno: 2776.1.8
    revision-id: pqm at pqm.ubuntu.com-20070903080656-1sn8ea2d3ohx75ek
    parent: pqm at pqm.ubuntu.com-20070903073425-ouk9qod51gqk18nn
    parent: bialix at ukr.net-20070903055401-93l26whhfjjnjo04
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 09:06:56 +0100
    message:
      (Wouter van Heyst) Dirstate blowing up on None as a minikind fingerprint
    modified:
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
        ------------------------------------------------------------
        revno: 2776.1.2.2.1
        revision-id: bialix at ukr.net-20070903055401-93l26whhfjjnjo04
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        parent: larstiq at larstiq.dyndns.org-20070721182719-7e2wfkplplkw6y7x
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: none.minikind.wouter
        timestamp: Mon 2007-09-03 08:54:01 +0300
        message:
          merged with bzr.dev
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
        ------------------------------------------------------------
        revno: 2645.2.1
        revision-id: larstiq at larstiq.dyndns.org-20070721182719-7e2wfkplplkw6y7x
        parent: pqm at pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: dirstate-serialization
        timestamp: Sat 2007-07-21 20:27:19 +0200
        message:
          The DirState fingerprint for tree-references should be an empty string instead of None
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
    ------------------------------------------------------------
    revno: 2776.1.7
    revision-id: pqm at pqm.ubuntu.com-20070903073425-ouk9qod51gqk18nn
    parent: pqm at pqm.ubuntu.com-20070903070212-g8basoqekm8c489k
    parent: ian.clatworthy at internode.on.net-20070903054111-xyba0ihklpfs73gc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 08:34:25 +0100
    message:
      (Ian Clatworthy) Verbosity levels and standard options
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
      bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
      bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 2776.1.3.1.1
        revision-id: ian.clatworthy at internode.on.net-20070903054111-xyba0ihklpfs73gc
        parent: pqm at pqm.ubuntu.com-20070903051736-tnjjdk1ii0258an0
        parent: ian.clatworthy at internode.on.net-20070903034749-op16cqnb8fi0jmde
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration
        timestamp: Mon 2007-09-03 15:41:11 +1000
        message:
          (Ian Clatworthy) Verbosity levels and standard options
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
          bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 2768.1.16
        revision-id: ian.clatworthy at internode.on.net-20070903034749-op16cqnb8fi0jmde
        parent: ian.clatworthy at internode.on.net-20070903015029-dmi0iqcqkejp27p3
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Mon 2007-09-03 13:47:49 +1000
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
        ------------------------------------------------------------
        revno: 2768.1.15
        revision-id: ian.clatworthy at internode.on.net-20070903015029-dmi0iqcqkejp27p3
        parent: ian.clatworthy at internode.on.net-20070903013349-o37wm1bxe04pctrm
        parent: pqm at pqm.ubuntu.com-20070902233606-wb062d366w5c83uc
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Mon 2007-09-03 11:50:29 +1000
        message:
          Merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
        ------------------------------------------------------------
        revno: 2768.1.14
        revision-id: ian.clatworthy at internode.on.net-20070903013349-o37wm1bxe04pctrm
        parent: ian.clatworthy at internode.on.net-20070831042259-9bal2zqm5kvgu5hl
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Mon 2007-09-03 11:33:49 +1000
        message:
          Incorporate feedback from poolie
        modified:
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
        ------------------------------------------------------------
        revno: 2768.1.13
        revision-id: ian.clatworthy at internode.on.net-20070831042259-9bal2zqm5kvgu5hl
        parent: ian.clatworthy at internode.on.net-20070831041239-onw9xs8s142qqt1m
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 14:22:59 +1000
        message:
          Minor fixes to help
        modified:
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
        ------------------------------------------------------------
        revno: 2768.1.12
        revision-id: ian.clatworthy at internode.on.net-20070831041239-onw9xs8s142qqt1m
        parent: ian.clatworthy at internode.on.net-20070831040757-30bmwliqsxd7zn6a
        parent: pqm at pqm.ubuntu.com-20070831020510-emrlta5dk6ta95zp
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 14:12:39 +1000
        message:
          merge bzr.dev
        added:
          doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
          doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
        ------------------------------------------------------------
        revno: 2768.1.11
        revision-id: ian.clatworthy at internode.on.net-20070831040757-30bmwliqsxd7zn6a
        parent: ian.clatworthy at internode.on.net-20070831020037-6drt2nnbu38907s5
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 14:07:57 +1000
        message:
          Add new option tests for custom help, callbacks and verbose/quiet linkage
        modified:
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
        ------------------------------------------------------------
        revno: 2768.1.10
        revision-id: ian.clatworthy at internode.on.net-20070831020037-6drt2nnbu38907s5
        parent: ian.clatworthy at internode.on.net-20070831014737-79wyvq0fwat06alc
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 12:00:37 +1000
        message:
          Add tests for new methods in trace.py
        modified:
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 2768.1.9
        revision-id: ian.clatworthy at internode.on.net-20070831014737-79wyvq0fwat06alc
        parent: ian.clatworthy at internode.on.net-20070831003537-29b1erv58zwb0kh7
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 11:47:37 +1000
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2768.1.8
        revision-id: ian.clatworthy at internode.on.net-20070831003537-29b1erv58zwb0kh7
        parent: ian.clatworthy at internode.on.net-20070831003508-8r26w7ydnzfh5bbg
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 10:35:37 +1000
        message:
          Get test suite fully working again
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
        ------------------------------------------------------------
        revno: 2768.1.7
        revision-id: ian.clatworthy at internode.on.net-20070831003508-8r26w7ydnzfh5bbg
        parent: ian.clatworthy at internode.on.net-20070830135357-dqr7saq6ciipx09d
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Fri 2007-08-31 10:35:08 +1000
        message:
          Fix reset of verbosity levels
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
        ------------------------------------------------------------
        revno: 2768.1.6
        revision-id: ian.clatworthy at internode.on.net-20070830135357-dqr7saq6ciipx09d
        parent: ian.clatworthy at internode.on.net-20070830135258-t146laed1vd0nqx0
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Thu 2007-08-30 23:53:57 +1000
        message:
          Fix existing option and help tests
        modified:
          bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
        ------------------------------------------------------------
        revno: 2768.1.5
        revision-id: ian.clatworthy at internode.on.net-20070830135258-t146laed1vd0nqx0
        parent: ian.clatworthy at internode.on.net-20070830134140-mjd6zw41nobxy51f
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Thu 2007-08-30 23:52:58 +1000
        message:
          Wrap new std verbose option with new help instead of declaring a new one
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2768.1.4
        revision-id: ian.clatworthy at internode.on.net-20070830134140-mjd6zw41nobxy51f
        parent: ian.clatworthy at internode.on.net-20070830134041-y6wd24dz52fpkthx
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Thu 2007-08-30 23:41:40 +1000
        message:
          Process --verbose and --quiet standard options
        modified:
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
        ------------------------------------------------------------
        revno: 2768.1.3
        revision-id: ian.clatworthy at internode.on.net-20070830134041-y6wd24dz52fpkthx
        parent: ian.clatworthy at internode.on.net-20070830133731-b2251gmd4zrlv4or
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Thu 2007-08-30 23:40:41 +1000
        message:
          Support custom help for commonly used options and standard option definition
        modified:
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
        ------------------------------------------------------------
        revno: 2768.1.2
        revision-id: ian.clatworthy at internode.on.net-20070830133731-b2251gmd4zrlv4or
        parent: ian.clatworthy at internode.on.net-20070830060751-bsphtblostbmheh4
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Thu 2007-08-30 23:37:31 +1000
        message:
          Make noise levels a scale, not just a boolean in trace.py
        modified:
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 2768.1.1
        revision-id: ian.clatworthy at internode.on.net-20070830060751-bsphtblostbmheh4
        parent: pqm at pqm.ubuntu.com-20070829235511-o6ftd800xa245p9h
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.std-options
        timestamp: Thu 2007-08-30 16:07:51 +1000
        message:
          Document standard options
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 2776.1.6
    revision-id: pqm at pqm.ubuntu.com-20070903070212-g8basoqekm8c489k
    parent: pqm at pqm.ubuntu.com-20070903062644-0rt7302gl1to109v
    parent: bialix at ukr.net-20070903052947-keh3u7dl382c0slg
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 08:02:12 +0100
    message:
      (Marius Cruger) bzr rm should remove clean subtrees (#111665, r=bialix)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
      bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2776.1.2.1.1
        revision-id: bialix at ukr.net-20070903052947-keh3u7dl382c0slg
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        parent: amanic at gmail.com-20070813204022-s6g7t8e660x9zq9y
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: rm.marius
        timestamp: Mon 2007-09-03 08:29:47 +0300
        message:
          merged with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.17
        revision-id: amanic at gmail.com-20070813204022-s6g7t8e660x9zq9y
        parent: amanic at gmail.com-20070813202904-g5gxzrf6sto99vgd
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Mon 2007-08-13 22:40:22 +0200
        message:
          Minor doc and spacing updates.
        modified:
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.16
        revision-id: amanic at gmail.com-20070813202904-g5gxzrf6sto99vgd
        parent: amanic at gmail.com-20070813200003-llmiom64a9sqj4gl
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Mon 2007-08-13 22:29:04 +0200
        message:
          * Rename `unknown_files_in_directory` to `unknown_nested_files`, which 
            is hopefully a little better.
          * Also consider unknown non-files as precious, so don't just delete them.
        modified:
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.15
        revision-id: amanic at gmail.com-20070813200003-llmiom64a9sqj4gl
        parent: amanic at gmail.com-20070811134033-xvpmchsolj3k3ijd
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Mon 2007-08-13 22:00:03 +0200
        message:
          Apply Alexander's comments:
          * Rename getTree => get_tree.
          * Rename getCommittedTree => get_committed_tree.
          * Extracted helper asserts: assertRemovedAndDeleted and
            assertRemovedAndNotDeleted
          * Fixed some docs.
          * Fixed my set to list conversion.
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.14
        revision-id: amanic at gmail.com-20070811134033-xvpmchsolj3k3ijd
        parent: amanic at gmail.com-20070811133042-4t8tbcd0iuf316kg
        parent: pqm at pqm.ubuntu.com-20070810230629-bcp0rgmbhp0z35e1
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Sat 2007-08-11 15:40:33 +0200
        message:
          merge with mainline
        added:
          tools/win32/survey.txt         survey.txt-20070809075950-sf265mgu9oog8jjb-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/workingtree_implementations/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/profiling.txt   profiling.txt-20070531045713-j15mxufywgzwdeu8-1
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 2655.2.13
        revision-id: amanic at gmail.com-20070811133042-4t8tbcd0iuf316kg
        parent: amanic at gmail.com-20070811112905-tmibrlb8h5ezu5am
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Sat 2007-08-11 15:30:42 +0200
        message:
          Updated NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2655.2.12
        revision-id: amanic at gmail.com-20070811112905-tmibrlb8h5ezu5am
        parent: amanic at gmail.com-20070809215100-th4poo3976eztba6
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Sat 2007-08-11 13:29:05 +0200
        message:
          Remove unknown ignored files wihtout needing --force'
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.11
        revision-id: amanic at gmail.com-20070809215100-th4poo3976eztba6
        parent: amanic at gmail.com-20070809212245-67p3cutlpdl9tzfj
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Thu 2007-08-09 23:51:00 +0200
        message:
          * Update NEWS
          * Test removing directories with renames in (without --force)
          * update comment in workingtree
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.10
        revision-id: amanic at gmail.com-20070809212245-67p3cutlpdl9tzfj
        parent: amanic at gmail.com-20070809204546-mru5ohlb5tlmoxsz
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Thu 2007-08-09 23:22:45 +0200
        message:
          add test for removing a direcory with something that has been moved out
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
        ------------------------------------------------------------
        revno: 2655.2.9
        revision-id: amanic at gmail.com-20070809204546-mru5ohlb5tlmoxsz
        parent: amanic at gmail.com-20070809165051-0kyj9w1hox2ng2n1
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Thu 2007-08-09 22:45:46 +0200
        message:
          * workingtree_implementations/test_remove 
            - Simplify tests by using the tree creating functions more and 
              remove the silly variables.
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
        ------------------------------------------------------------
        revno: 2655.2.8
        revision-id: amanic at gmail.com-20070809165051-0kyj9w1hox2ng2n1
        parent: amanic at gmail.com-20070809064355-r3v8ncgw9wumk5jp
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Thu 2007-08-09 18:50:51 +0200
        message:
          * workingtree_implementations/test_remove
            - Let getTree check if the files were really created.
            - Add utility method getCommittedTree.
            - Fix test_remove_nonempty_directory to not check for the removal of empty 
              directories.
            - Fix test_dont_remove_directory_with_unknowns to check if we refuse to 
              delete directories containing unknown files or directories.
            - Fix some method names and docstrings as per review
          * workingtree.remove
            - Don't automatically remove empty directories.
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.7
        revision-id: amanic at gmail.com-20070809064355-r3v8ncgw9wumk5jp
        parent: amanic at gmail.com-20070805013923-bp4zn0iama2rcfb6
        parent: pqm at pqm.ubuntu.com-20070808113110-acathx9d9mpfo80z
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Thu 2007-08-09 08:43:55 +0200
        message:
          merge with bzr.dev
        removed:
          bzrlib/file_names.py           file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
          bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
        added:
          bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
          bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
          bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
        renamed:
          doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
          bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          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_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
          bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          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/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
          doc/developers/bundles.txt     bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
          doc/http_smart_server.txt      fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/index.txt                  index.txt-20060622101119-tgwtdci8z769bjb9-2
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
          tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
          tools/rst2html.py              rst2html.py-20060817120932-gn177u8v0008txhu-1
          tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2655.2.6
        revision-id: amanic at gmail.com-20070805013923-bp4zn0iama2rcfb6
        parent: amanic at gmail.com-20070804203629-asas198adwjjfexw
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Sun 2007-08-05 03:39:23 +0200
        message:
          * workingtree.remove
            - Make sure we delete subtrees.
            - Fix minor bug where unknowns were shown multiple times.
          * workingtree_implementations.test_remove
            - Make test_remove_nonempty_directory test that unknown empty directories
              are removed.
            - Make test_force_remove_nonempty_directory test that unknown subtrees
              are removed regardless of content.
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.5
        revision-id: amanic at gmail.com-20070804203629-asas198adwjjfexw
        parent: amanic at gmail.com-20070804201202-ek3hht4o71cjpl44
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Sat 2007-08-04 22:36:29 +0200
        message:
          * Improve BzrRemoveChangedFilesError message.
          * Add some spaces in tests/__init__.assertInWorkingTree parameter list.
          * Remove some unneeded imports.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
        ------------------------------------------------------------
        revno: 2655.2.4
        revision-id: amanic at gmail.com-20070804201202-ek3hht4o71cjpl44
        parent: amanic at gmail.com-20070804150516-eekxw9tu6y9aoga7
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.rm_delete_working_file
        timestamp: Sat 2007-08-04 22:12:02 +0200
        message:
          * workingtree.remove
            - Recursively remove directories when force is given.
            - Fix some doc strings and code formatting.
            - Remove TODO which I believe has been done.
          * workingtree_implementations/test_remove
            - Test recursive removing of directories when forced.
            - Fix some doc strings.
            - Rename test_remove_subtree to test_remove_keep_subtree.
              move and update it. (although it looks redundant to me)
            - Let test_non_cwd check if it was properly unversioned too.
        modified:
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2655.2.3
        revision-id: amanic at gmail.com-20070804150516-eekxw9tu6y9aoga7
        parent: amanic at gmail.com-20070731194215-4d9r1l48kr4or3wj
        parent: pqm at pqm.ubuntu.com-20070801171451-en3tds1hzlru2j83
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.intertree_compare_ignores_param
        timestamp: Sat 2007-08-04 17:05:16 +0200
        message:
          merge with bzr.dev
        renamed:
          bzrlib/tests/blackbox/test_submit.py => bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
        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/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lsprof.py               lsprof.py-20051208071030-833790916798ceed
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
          bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
          bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          doc/developers/HACKING         HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/profiling.txt   profiling.txt-20070531045713-j15mxufywgzwdeu8-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 2776.1.5
    revision-id: pqm at pqm.ubuntu.com-20070903062644-0rt7302gl1to109v
    parent: pqm at pqm.ubuntu.com-20070903055311-zvcgrtq3543wuyyc
    parent: mbp at sourcefrog.net-20070903051116-nuqs4zh8mtdegoul
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 07:26:44 +0100
    message:
      (andreas) better bzr serve documentation
    modified:
      doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
        ------------------------------------------------------------
        revno: 2776.1.1.2.1
        revision-id: mbp at sourcefrog.net-20070903051116-nuqs4zh8mtdegoul
        parent: pqm at pqm.ubuntu.com-20070902233606-wb062d366w5c83uc
        parent: aj at dungeon.inka.de-20070829090607-sqwop24h94y0om8o
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc2
        timestamp: Mon 2007-09-03 15:11:16 +1000
        message:
          (andreas) better bzr serve documentation
        modified:
          doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
        ------------------------------------------------------------
        revno: 2765.2.1
        revision-id: aj at dungeon.inka.de-20070829090607-sqwop24h94y0om8o
        parent: pqm at pqm.ubuntu.com-20070829061006-7zz2j5icnc8do0ru
        committer: Andreas Jellinghaus <aj at dungeon.inka.de>
        branch nick: bzr.dev
        timestamp: Wed 2007-08-29 11:06:07 +0200
        message:
          1.) change order: simple example first.
          2.) fix complex example: if bzr is bound to localhost (i.e. 127.0.0.1 / lo),
              then a client cannot reach it via the hostname (typically bound to the
              ip on eth0 / network interface).
        modified:
          doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
    ------------------------------------------------------------
    revno: 2776.1.4
    revision-id: pqm at pqm.ubuntu.com-20070903055311-zvcgrtq3543wuyyc
    parent: pqm at pqm.ubuntu.com-20070903051736-tnjjdk1ii0258an0
    parent: mbp at sourcefrog.net-20070713053656-2pp1tur9c71piba4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 06:53:11 +0100
    message:
      doc and help updates
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2614.1.1
        revision-id: mbp at sourcefrog.net-20070713053656-2pp1tur9c71piba4
        parent: pqm at pqm.ubuntu.com-20070713041212-ar46c24wgu0jhtm5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Fri 2007-07-13 15:36:56 +1000
        message:
          Doc for revert, #87548
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2776.1.3
    revision-id: pqm at pqm.ubuntu.com-20070903051736-tnjjdk1ii0258an0
    parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
    parent: mbp at sourcefrog.net-20070903044538-4iglni6xv5nkk737
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 06:17:36 +0100
    message:
      (mbp,r=aaron) Add per-inventory-implementation tests
    added:
      bzrlib/tests/inventory_implementations/ bzrlibtestsinventory-20070820060653-4mjbbmwhp74dsf3x-1
      bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
      bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 2729.1.2.1.9
        revision-id: mbp at sourcefrog.net-20070903044538-4iglni6xv5nkk737
        parent: mbp at sourcefrog.net-20070903044151-1i0i66weatycmhf1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-tests
        timestamp: Mon 2007-09-03 14:45:38 +1000
        message:
          Move actual tests from inventory_implementations __init__ into basics.py (Aaron)
        added:
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
        modified:
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
        ------------------------------------------------------------
        revno: 2729.1.2.1.8
        revision-id: mbp at sourcefrog.net-20070903044151-1i0i66weatycmhf1
        parent: mbp at sourcefrog.net-20070903043549-0cfyrgx7z2h8ppks
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-tests
        timestamp: Mon 2007-09-03 14:41:51 +1000
        message:
          Fix mis-merged NEWS entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2729.1.2.1.7
        revision-id: mbp at sourcefrog.net-20070903043549-0cfyrgx7z2h8ppks
        parent: mbp at sourcefrog.net-20070824061553-6bou4l4e322qeufy
        parent: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-tests
        timestamp: Mon 2007-09-03 14:35:49 +1000
        message:
          merge trunk
        added:
          doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
          doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
          doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
          doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          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.py                 help.py-20050505025907-4dd7a6d63912f894
          bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          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_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
          doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
          tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
        ------------------------------------------------------------
        revno: 2729.1.2.1.6
        revision-id: mbp at sourcefrog.net-20070824061553-6bou4l4e322qeufy
        parent: mbp at sourcefrog.net-20070821052959-5odvyjziwyuaeo3d
        parent: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-tests
        timestamp: Fri 2007-08-24 16:15:53 +1000
        message:
          merge trunk
        removed:
          doc/README.1st                 README.1st-20060314161707-b943d5d4cce669b6
          doc/developers/scratch.txt     scratch.txt-20070618020404-cdhv0ecgrukomemg-3
        added:
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/util/simplemapi.py      simplemapi.py-20070810174811-ievl23nziuiq2k3m-1
          doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
          doc/en/                        en-20070810050627-g7r46azs5mlwj61j-1
          doc/en/developer-guide/        developerguide-20070810050627-g7r46azs5mlwj61j-2
          doc/en/mini-tutorial/          minitutorial-20070813141352-2u64ooqzo0or4hss-1
          doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
          doc/en/quick-reference/        quickreference-20070813143223-5i7bgw7w8s7l3ae2-1
          doc/en/quick-reference/Makefile makefile-20070813143223-5i7bgw7w8s7l3ae2-2
          doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
          doc/en/release-notes/          releasenotes-20070810050627-g7r46azs5mlwj61j-3
          doc/en/user-guide/             userguide-20070810050627-g7r46azs5mlwj61j-4
          doc/en/user-reference/         userreference-20070810050627-g7r46azs5mlwj61j-5
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
        renamed:
          doc/bug_trackers.txt => doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/centralized_workflow.txt => doc/en/user-guide/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
          doc/configuration.txt => doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
          doc/conflicts.txt => doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
          doc/http_smart_server.txt => doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
          doc/index.txt => doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/plugins.txt => doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
          doc/server.txt => doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
          doc/setting_up_email.txt => doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
          doc/shared_repository_layouts.txt => doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
          doc/specifying_revisions.txt => doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
          doc/tutorial.txt => doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
          doc/using_aliases.txt => doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
          doc/version_info.txt => doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
          bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
          bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          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/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/fakevfat.py   fakevfat.py-20060407072414-d59939fa1d6c79d9
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/bazaar-vcs.org.kid         bazaarvcs.org.kid-20060929181918-huv7bgmdey0ktqci-1
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
          doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/rst2prettyhtml.py        rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
          tools/win32/ostools.py         ostools.py-20060731163025-npjffm46rgnkl50d-1
          doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
        ------------------------------------------------------------
        revno: 2729.1.2.1.5
        revision-id: mbp at sourcefrog.net-20070821052959-5odvyjziwyuaeo3d
        parent: mbp at sourcefrog.net-20070821050831-p5igoti17fstdxds
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-refactor
        timestamp: Tue 2007-08-21 15:29:59 +1000
        message:
          Move per-inventory tests from test_inv to tests.inventory_implementations
        modified:
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
        ------------------------------------------------------------
        revno: 2729.1.2.1.4
        revision-id: mbp at sourcefrog.net-20070821050831-p5igoti17fstdxds
        parent: mbp at sourcefrog.net-20070821050429-4dn2xziq91kgwkir
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-refactor
        timestamp: Tue 2007-08-21 15:08:31 +1000
        message:
          move some osutils-related tests from test_inv to test_osutils
        modified:
          bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 2729.1.2.1.3
        revision-id: mbp at sourcefrog.net-20070821050429-4dn2xziq91kgwkir
        parent: mbp at sourcefrog.net-20070821050207-ys2rrhoo0pud4isl
        parent: mbp at sourcefrog.net-20070821050305-64tehj3dk3d4y1px
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-refactor
        timestamp: Tue 2007-08-21 15:04:29 +1000
        message:
          TestScenarioAdapter fix merge
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
        ------------------------------------------------------------
        revno: 2729.1.2.1.2
        revision-id: mbp at sourcefrog.net-20070821050207-ys2rrhoo0pud4isl
        parent: mbp at sourcefrog.net-20070821044932-92qvnrn8u62f8cl2
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-refactor
        timestamp: Tue 2007-08-21 15:02:07 +1000
        message:
          Start moving inventory tests into per-inventory module
        modified:
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
        ------------------------------------------------------------
        revno: 2729.1.2.1.1
        revision-id: mbp at sourcefrog.net-20070821044932-92qvnrn8u62f8cl2
        parent: mbp at sourcefrog.net-20070821030216-2bfghdwpyk2se1of
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: inv-refactor
        timestamp: Tue 2007-08-21 14:49:32 +1000
        message:
          Start adding per-inventory tests
        added:
          bzrlib/tests/inventory_implementations/ bzrlibtestsinventory-20070820060653-4mjbbmwhp74dsf3x-1
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 2776.1.2
    revision-id: pqm at pqm.ubuntu.com-20070903031921-8msn0bmzubicv5b1
    parent: pqm at pqm.ubuntu.com-20070902233606-wb062d366w5c83uc
    parent: ian.clatworthy at internode.on.net-20070903023735-sdgp3h0hooptbhlo
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 04:19:21 +0100
    message:
      (Ian Clatworthy)(trivial) Fix NEWS indenting and ReST nits in developers/update.txt
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
        ------------------------------------------------------------
        revno: 2776.1.1.1.1
        revision-id: ian.clatworthy at internode.on.net-20070903023735-sdgp3h0hooptbhlo
        parent: pqm at pqm.ubuntu.com-20070902233606-wb062d366w5c83uc
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration
        timestamp: Mon 2007-09-03 12:37:35 +1000
        message:
          (Ian Clatworthy)(trivial) Fix NEWS indenting and ReST nits in developers/update.txt
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
    ------------------------------------------------------------
    revno: 2776.1.1
    revision-id: pqm at pqm.ubuntu.com-20070902233606-wb062d366w5c83uc
    parent: pqm at pqm.ubuntu.com-20070901160444-hcr66zejwyy0jezc
    parent: aaron.bentley at utoronto.ca-20070902223854-vh6jc4c19w94htsm
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-03 00:36:06 +0100
    message:
      Support annotating knits with no annotation cache
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
    ------------------------------------------------------------
    revno: 2770.1.10
    revision-id: aaron.bentley at utoronto.ca-20070902223854-vh6jc4c19w94htsm
    parent: aaron.bentley at utoronto.ca-20070902223333-e0g232qwy63mj4qm
    parent: pqm at pqm.ubuntu.com-20070901160444-hcr66zejwyy0jezc
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Sun 2007-09-02 18:38:54 -0400
    message:
      Merge bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
      bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
      bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
      bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
      bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      doc/en/user-guide/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    revno: 2770.1.9
    revision-id: aaron.bentley at utoronto.ca-20070902223333-e0g232qwy63mj4qm
    parent: aaron.bentley at utoronto.ca-20070902222950-s810wxdatgaap7by
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Sun 2007-09-02 18:33:33 -0400
    message:
      Simplify annotate iterator
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 2770.1.8
    revision-id: aaron.bentley at utoronto.ca-20070902222950-s810wxdatgaap7by
    parent: abentley at panoramicfeedback.com-20070831200932-cce1tz9ft6bdfjw5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Sun 2007-09-02 18:29:50 -0400
    message:
      Use topo-sorted ancestry for generating annotations
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 2770.1.7
    revision-id: abentley at panoramicfeedback.com-20070831200932-cce1tz9ft6bdfjw5
    parent: abentley at panoramicfeedback.com-20070831194044-1328krhsdc795cbc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: pack-annotate
    timestamp: Fri 2007-08-31 16:09:32 -0400
    message:
      Update NEWS
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 2770.1.6
    revision-id: abentley at panoramicfeedback.com-20070831194044-1328krhsdc795cbc
    parent: abentley at panoramicfeedback.com-20070831193852-6ip22sbw058yib5u
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: pack-annotate
    timestamp: Fri 2007-08-31 15:40:44 -0400
    message:
      Remove annotate override for normal knits
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 2770.1.5
    revision-id: abentley at panoramicfeedback.com-20070831193852-6ip22sbw058yib5u
    parent: aaron.bentley at utoronto.ca-20070831121426-rh5lo64rygkpy3xs
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: pack-annotate
    timestamp: Fri 2007-08-31 15:38:52 -0400
    message:
      Clean up docs, test matching blocks for reannotate
    modified:
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
    ------------------------------------------------------------
    revno: 2770.1.4
    revision-id: aaron.bentley at utoronto.ca-20070831121426-rh5lo64rygkpy3xs
    parent: aaron.bentley at utoronto.ca-20070831035850-9ap3s1a6m0qc03zg
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Fri 2007-08-31 08:14:26 -0400
    message:
      Further optimize annotation, using existing matching blocks
    modified:
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 2770.1.3
    revision-id: aaron.bentley at utoronto.ca-20070831035850-9ap3s1a6m0qc03zg
    parent: aaron.bentley at utoronto.ca-20070831031243-c87mp74f7xvdymi1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Thu 2007-08-30 23:58:50 -0400
    message:
      Rework knit annotation as stack-based
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 2770.1.2
    revision-id: aaron.bentley at utoronto.ca-20070831031243-c87mp74f7xvdymi1
    parent: aaron.bentley at utoronto.ca-20070831025954-bs1ngof5pa3kejrs
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Thu 2007-08-30 23:12:43 -0400
    message:
      Convert to knit-only annotation
    modified:
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 2770.1.1
    revision-id: aaron.bentley at utoronto.ca-20070831025954-bs1ngof5pa3kejrs
    parent: pqm at pqm.ubuntu.com-20070830171447-t9j1u709q4yw63lh
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: pack-annotate
    timestamp: Thu 2007-08-30 22:59:54 -0400
    message:
      Initial implmentation of plain knit annotation
    modified:
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5

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



More information about the bazaar-commits mailing list