Rev 3622: Merge in bzr.dev, resolve NEWS in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

John Arbash Meinel john at arbash-meinel.com
Thu Aug 14 18:06:10 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 3622
revision-id: john at arbash-meinel.com-20080814170306-ucffga2qhv6kwgju
parent: robertc at robertcollins.net-20080814042150-n13mos3tt90xw2rp
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 12:03:06 -0500
message:
  Merge in bzr.dev, resolve NEWS
added:
  doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 3620.1.9
    revision-id: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
    parent: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
    parent: robertc at robertcollins.net-20080814065435-73xgy9r6xtqmvzux
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-08-14 08:41:17 +0100
    message:
      (robertc) Improve the testing of InterTree.iter_changes and fix bugs
      	found as a result (Robert Collins, Aaron Bentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
      bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3619.4.4
        revision-id: robertc at robertcollins.net-20080814065435-73xgy9r6xtqmvzux
        parent: robertc at robertcollins.net-20080814064629-wuzmbxzw7tn27usi
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Thu 2008-08-14 16:54:35 +1000
        message:
          Review feedback.
        modified:
          bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
        ------------------------------------------------------------
        revno: 3619.4.3
        revision-id: robertc at robertcollins.net-20080814064629-wuzmbxzw7tn27usi
        parent: robertc at robertcollins.net-20080814052902-1e5a6qm37sqhs2ji
        parent: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Thu 2008-08-14 16:46:29 +1000
        message:
          Resolve conflicts in NEWS.
        added:
          doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3619.4.2
        revision-id: robertc at robertcollins.net-20080814052902-1e5a6qm37sqhs2ji
        parent: robertc at robertcollins.net-20080813032119-09pl9q0t9gxng5t6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: intertree.missing
        timestamp: Thu 2008-08-14 15:29:02 +1000
        message:
          Change bzrlib.diff.DiffTree.show_diff to skip entries missing in both trees.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3619.4.1
        revision-id: robertc at robertcollins.net-20080813032119-09pl9q0t9gxng5t6
        parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: intertree.missing
        timestamp: Wed 2008-08-13 13:21:19 +1000
        message:
          Improve tests for the behaviour of Tree.iter_changes for missing paths that are only present in one tree, and fix found bugs. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 3620.1.8
    revision-id: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
    parent: pqm at pqm.ubuntu.com-20080814035325-ikgddts7pv17l23e
    parent: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-08-14 05:22:50 +0100
    message:
      (spiv) Fix a regression in bzr+http:// where http wasn't implementing
      	a necessary function.
    modified:
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
        ------------------------------------------------------------
        revno: 3606.4.1
        revision-id: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
        parent: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: hpss-http-bug
        timestamp: Thu 2008-08-14 12:15:31 +1000
        message:
          Fix NotImplementedError when probing for smart protocol via HTTP.
        modified:
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    revno: 3620.1.7
    revision-id: pqm at pqm.ubuntu.com-20080814035325-ikgddts7pv17l23e
    parent: pqm at pqm.ubuntu.com-20080814032324-mhfk4rggo7hgxeuf
    parent: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-08-14 04:53:25 +0100
    message:
      (robertc) Disable reading .bzrrules from the working tree.
    modified:
      bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
      bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
        ------------------------------------------------------------
        revno: 3606.2.5
        revision-id: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
        parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
        author: Robert Collins <robertc at robertcollins.net>
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2008-08-13 22:08:42 -0500
        message:
          Cherry pick Robert's 'disable .bzrrules in-tree' patch
        modified:
          bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
          bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
    ------------------------------------------------------------
    revno: 3620.1.6
    revision-id: pqm at pqm.ubuntu.com-20080814032324-mhfk4rggo7hgxeuf
    parent: pqm at pqm.ubuntu.com-20080813232540-mgtcd9chtkd9kda0
    parent: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-08-14 04:23:24 +0100
    message:
      (Mark Hammond) Updates to setup.py to support bundling tortoisebzr
      	and qbzr into the standalone win32 installer.
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
      tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3565.5.9
        revision-id: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
        parent: mhammond at skippinet.com.au-20080813233916-co6sjx89hnu9pgfe
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Thu 2008-08-14 11:41:30 +1000
        message:
          Address John's review comments
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3565.5.8
        revision-id: mhammond at skippinet.com.au-20080813233916-co6sjx89hnu9pgfe
        parent: mhammond at skippinet.com.au-20080810111639-9upz1wig1s8lvz62
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Thu 2008-08-14 09:39:16 +1000
        message:
          s/TBZR/Tortoise/ in the Inno status messages.
        modified:
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3565.5.7
        revision-id: mhammond at skippinet.com.au-20080810111639-9upz1wig1s8lvz62
        parent: mhammond at skippinet.com.au-20080731070112-aafagt2n4lax4977
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Sun 2008-08-10 21:16:39 +1000
        message:
          install all files with 'restartreplace uninsrestartdelete' and close
          tbzrcache at uninstall time.
        modified:
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3565.5.6
        revision-id: mhammond at skippinet.com.au-20080731070112-aafagt2n4lax4977
        parent: mhammond at skippinet.com.au-20080731065534-n0jl9z7sim2lj36z
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Thu 2008-07-31 17:01:12 +1000
        message:
          move tbzr and qbzr py2exe config code into their own functions.
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3565.5.5
        revision-id: mhammond at skippinet.com.au-20080731065534-n0jl9z7sim2lj36z
        parent: mhammond at skippinet.com.au-20080731053858-rzby1lwoufgoocww
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Thu 2008-07-31 16:55:34 +1000
        message:
          paramiko has applied a patch making win32ui unnecessary and the wiki has
          been updated with the defails, so checking for that dll can be removed.
        modified:
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3565.5.4
        revision-id: mhammond at skippinet.com.au-20080731053858-rzby1lwoufgoocww
        parent: mhammond at skippinet.com.au-20080731053215-3cu1wwxigtyu1kml
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Thu 2008-07-31 15:38:58 +1000
        message:
          byte-compile plugins; tweaks so qbzr and bzrsvn can be packaged.
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3565.5.3
        revision-id: mhammond at skippinet.com.au-20080731053215-3cu1wwxigtyu1kml
        parent: mhammond at skippinet.com.au-20080722105302-027b8v2xx2ts1iai
        parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Thu 2008-07-31 15:32:15 +1000
        message:
          merge
        added:
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
          bzrlib/_patiencediff_py.py     cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/export/dir_exporter.py  dir_exporter.py-20051114235828-b51397f56bc7b117
          bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
          bzrlib/export/zip_exporter.py  zip_exporter.py-20051114235828-8f57f954fba6497e
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
          bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
          bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          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/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
          tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
        ------------------------------------------------------------
        revno: 3565.5.2
        revision-id: mhammond at skippinet.com.au-20080722105302-027b8v2xx2ts1iai
        parent: mhammond at skippinet.com.au-20080722090655-k7uicuhkin9wgf1u
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Tue 2008-07-22 20:53:02 +1000
        message:
          merge inno script changes
        modified:
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3565.5.1
        revision-id: mhammond at skippinet.com.au-20080722090655-k7uicuhkin9wgf1u
        parent: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
        committer: Mark Hammond <mhammond at skippinet.com.au>
        branch nick: bzr.work.win32binary.tbzr-setup
        timestamp: Tue 2008-07-22 19:06:55 +1000
        message:
          merge setup.py changes for tbzr
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3620.1.5
    revision-id: pqm at pqm.ubuntu.com-20080813232540-mgtcd9chtkd9kda0
    parent: pqm at pqm.ubuntu.com-20080813064214-jc5n4sj20j81qcwy
    parent: john at arbash-meinel.com-20080813225155-t914z2fqyi072dd4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-08-14 00:25:40 +0100
    message:
      (jam) Bring 1.6rc2 back into bzr.dev, and fix up NEWS entries.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3620.3.1
        revision-id: john at arbash-meinel.com-20080813225155-t914z2fqyi072dd4
        parent: pqm at pqm.ubuntu.com-20080813064214-jc5n4sj20j81qcwy
        parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2008-08-13 17:51:55 -0500
        message:
          Bring in 1.6rc2, and update NEWS.
          
          Some things that were IN DEVELOPMENT were released in bzr 1.6rc2.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3606.2.4
        tags: bzr-1.6rc2
        revision-id: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
        parent: pqm at pqm.ubuntu.com-20080813171514-ukw1ll8hhtge74z8
        parent: john at arbash-meinel.com-20080813182409-gdaw15ylafacc173
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.6
        timestamp: Wed 2008-08-13 19:54:56 +0100
        message:
          (jam) Fix handling of ENOTDIR for win32,
          	and prepare the 1.6rc2 release.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3596.2.6
            revision-id: john at arbash-meinel.com-20080813182409-gdaw15ylafacc173
            parent: john at arbash-meinel.com-20080813173534-0kb0kr70q505ihph
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32_enotdir
            timestamp: Wed 2008-08-13 13:24:09 -0500
            message:
              Turns out that osutils wasn't imported directly into transform
            modified:
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3596.2.5
            revision-id: john at arbash-meinel.com-20080813173534-0kb0kr70q505ihph
            parent: john at arbash-meinel.com-20080813173115-mj34cv2uoxrnw32n
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32_enotdir
            timestamp: Wed 2008-08-13 12:35:34 -0500
            message:
              Fix up NEWS and version info to prepare 1.6rc2
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzr                            bzr.py-20050313053754-5485f144c7006fa6
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
            ------------------------------------------------------------
            revno: 3596.2.4
            revision-id: john at arbash-meinel.com-20080813173115-mj34cv2uoxrnw32n
            parent: john at arbash-meinel.com-20080813172516-mlg6z6anklyrq21j
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32_enotdir
            timestamp: Wed 2008-08-13 12:31:15 -0500
            message:
              NEWS entries for the various bugfixes merged
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3596.2.3
            revision-id: john at arbash-meinel.com-20080813172516-mlg6z6anklyrq21j
            parent: john at arbash-meinel.com-20080813160710-ns4og8r4y6xcmp0b
            parent: pqm at pqm.ubuntu.com-20080813171514-ukw1ll8hhtge74z8
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: win32_enotdir
            timestamp: Wed 2008-08-13 12:25:16 -0500
            message:
              Merge in 1.6 tip
            added:
              bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
              bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzr                            bzr.py-20050313053754-5485f144c7006fa6
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
              bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
              bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
              bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
              bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
              bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
              bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
              bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
              bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
              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/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
              bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
            ------------------------------------------------------------
            revno: 3596.2.2
            revision-id: john at arbash-meinel.com-20080813160710-ns4og8r4y6xcmp0b
            parent: mhammond at skippinet.com.au-20080809050006-5sf16g2b7eijnkwz
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: jam-integration
            timestamp: Wed 2008-08-13 11:07:10 -0500
            message:
              Factor out the common exception handling looking for ENOTDIR and use it
              for osutils.walkdirs() and tree transform code.
            modified:
              bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3596.2.1
            revision-id: mhammond at skippinet.com.au-20080809050006-5sf16g2b7eijnkwz
            parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
            committer: Mark Hammond <mhammond at skippinet.com.au>
            branch nick: bzr.work.tests
            timestamp: Sat 2008-08-09 15:00:06 +1000
            message:
              Correctly catch and handle os.listdir errors on Windows
            modified:
              bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3606.2.3
        revision-id: pqm at pqm.ubuntu.com-20080813171514-ukw1ll8hhtge74z8
        parent: pqm at pqm.ubuntu.com-20080813150626-htj2l5by2vy2uol1
        parent: aaron at aaronbentley.com-20080813140357-w4n79too1x2c749k
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.6
        timestamp: Wed 2008-08-13 18:15:14 +0100
        message:
          (Aaron Bentley) Update repo format strings
        modified:
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
            ------------------------------------------------------------
            revno: 3606.3.1
            revision-id: aaron at aaronbentley.com-20080813140357-w4n79too1x2c749k
            parent: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
            committer: Aaron Bentley <aaron at aaronbentley.com>
            branch nick: bzr.1.6
            timestamp: Wed 2008-08-13 10:03:57 -0400
            message:
              Update repo format strings
            modified:
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
        ------------------------------------------------------------
        revno: 3606.2.2
        revision-id: pqm at pqm.ubuntu.com-20080813150626-htj2l5by2vy2uol1
        parent: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
        parent: jelmer at samba.org-20080809004530-v2g6mrvl4bc1tae1
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.6
        timestamp: Wed 2008-08-13 16:06:26 +0100
        message:
          (Jelmer) Fix a smal bug in Inventory.copy()
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
    ------------------------------------------------------------
    revno: 3620.1.4
    revision-id: pqm at pqm.ubuntu.com-20080813064214-jc5n4sj20j81qcwy
    parent: pqm at pqm.ubuntu.com-20080813033958-o4nve9kwgoa1nlir
    parent: andrew.bennetts at canonical.com-20080813053026-z5zul3vg110232n1
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-08-13 07:42:14 +0100
    message:
      Move the notes on writing tests out of HACKING into a new file,
      	and improve them. (Andrew Bennetts)
    added:
      doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 3619.3.2
        revision-id: andrew.bennetts at canonical.com-20080813053026-z5zul3vg110232n1
        parent: andrew.bennetts at canonical.com-20080812145326-yx693x2jc4rcovb7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: HACKING updates
        timestamp: Wed 2008-08-13 15:30:26 +1000
        message:
          Remove references to unimplemented TestPlatformLimit, remove some redundant (and misplaced) text from 'Test feature dependencies'.
        modified:
          doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
        ------------------------------------------------------------
        revno: 3619.3.1
        revision-id: andrew.bennetts at canonical.com-20080812145326-yx693x2jc4rcovb7
        parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: HACKING updates
        timestamp: Wed 2008-08-13 00:53:26 +1000
        message:
          Move the notes on writing tests out of HACKING into a new file, and improve
          them.
          
          Many of the testing notes in the HACKING file were in duplicated in two places
          in that file!  This change removes that duplication.  It also adds new sections
          on “Where should I put a new test?” and “TestCase and its subclasses”, and
          others like “Test feature dependencies” have been expanded.  The whole document
          has generally been edited to be a bit more coherent. 
        added:
          doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 3620.1.3
    revision-id: pqm at pqm.ubuntu.com-20080813033958-o4nve9kwgoa1nlir
    parent: pqm at pqm.ubuntu.com-20080813025404-kmul7igvg0d7w4va
    parent: aaron at aaronbentley.com-20080812141923-khi07xuwwi6gnm86
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-08-13 04:39:58 +0100
    message:
      Refactor TreeTransform to extract _generate_inventory_delta (abentley)
    modified:
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.11
        revision-id: aaron at aaronbentley.com-20080812141923-khi07xuwwi6gnm86
        parent: aaron at aaronbentley.com-20080812140341-nytxmmhztdg5zxfh
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 10:19:23 -0400
        message:
          Tweak new_paths logic
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.10
        revision-id: aaron at aaronbentley.com-20080812140341-nytxmmhztdg5zxfh
        parent: aaron at aaronbentley.com-20080812130646-d74yxibi8fm4n40g
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 10:03:41 -0400
        message:
          Compensate for stale entries in TT._needs_rename
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.9
        revision-id: aaron at aaronbentley.com-20080812130646-d74yxibi8fm4n40g
        parent: aaron at aaronbentley.com-20080812130323-drs3nke90pq02t5g
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 09:06:46 -0400
        message:
          Update docs
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.8
        revision-id: aaron at aaronbentley.com-20080812130323-drs3nke90pq02t5g
        parent: abentley at stumpy-20080812073116-qrnxjlrjyozq270v
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 09:03:23 -0400
        message:
          Reorganize execute-bit handling
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.7
        revision-id: abentley at stumpy-20080812073116-qrnxjlrjyozq270v
        parent: aaron at aaronbentley.com-20080812062153-dxnnuq4s8di98xob
        committer: Aaron Bentley <abentley at stumpy>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 03:31:16 -0400
        message:
          Fix progress handling
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.6
        revision-id: aaron at aaronbentley.com-20080812062153-dxnnuq4s8di98xob
        parent: aaron at aaronbentley.com-20080812061438-bc1hxhxz0fd829qw
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 02:21:53 -0400
        message:
          More tweaking
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.5
        revision-id: aaron at aaronbentley.com-20080812061438-bc1hxhxz0fd829qw
        parent: aaron at aaronbentley.com-20080812055617-p3womlx16jei3sgf
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 02:14:38 -0400
        message:
          Reduce set tests
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.4
        revision-id: aaron at aaronbentley.com-20080812055617-p3womlx16jei3sgf
        parent: aaron at aaronbentley.com-20080812044904-gjotd2kgh2i3675n
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 01:56:17 -0400
        message:
          Further restructuring
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.3
        revision-id: aaron at aaronbentley.com-20080812044904-gjotd2kgh2i3675n
        parent: aaron at aaronbentley.com-20080812041312-ydtwxp53d1jjwvky
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 00:49:04 -0400
        message:
          Remove unused code
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.2
        revision-id: aaron at aaronbentley.com-20080812041312-ydtwxp53d1jjwvky
        parent: aaron at aaronbentley.com-20080812033329-9t2sw9fve78ri7hy
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Tue 2008-08-12 00:13:12 -0400
        message:
          Further cleanup
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3619.2.1
        revision-id: aaron at aaronbentley.com-20080812033329-9t2sw9fve78ri7hy
        parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: separate-delta
        timestamp: Mon 2008-08-11 23:33:29 -0400
        message:
          Refactor inventory delta generation out of apply_insersions/removals
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3620.1.2
    revision-id: pqm at pqm.ubuntu.com-20080813025404-kmul7igvg0d7w4va
    parent: pqm at pqm.ubuntu.com-20080813020322-v230uatfihz5zfm6
    parent: jml at canonical.com-20080813021301-9n2qhopsv5jk929r
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-08-13 03:54:04 +0100
    message:
      Allow addCleanup to take arguments,
      	and remove addCleanup's uniqueness constraint. (Jonathan Lange)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3620.2.2
        revision-id: jml at canonical.com-20080813021301-9n2qhopsv5jk929r
        parent: jml at canonical.com-20080813013046-b9voimnnr9eghlbz
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: addCleanup-args
        timestamp: Wed 2008-08-13 12:13:01 +1000
        message:
          Add an entry for addCleanup changes.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3620.2.1
        revision-id: jml at canonical.com-20080813013046-b9voimnnr9eghlbz
        parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
        committer: Jonathan Lange <jml at canonical.com>
        branch nick: addCleanup-args
        timestamp: Wed 2008-08-13 11:30:46 +1000
        message:
          Let addCleanup take arguments that are then passed to the cleanup.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3620.1.1
    revision-id: pqm at pqm.ubuntu.com-20080813020322-v230uatfihz5zfm6
    parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
    parent: robertc at robertcollins.net-20080813013031-ghubj7wij3nsg0sw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-08-13 03:03:22 +0100
    message:
      (robertc) Tighten up the handling of carried over inventory entries.
      	(Robert Collins)
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3619.1.2
    revision-id: robertc at robertcollins.net-20080813013031-ghubj7wij3nsg0sw
    parent: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bug-256409
    timestamp: Wed 2008-08-13 11:30:31 +1000
    message:
      Review feedback.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3619.1.1
    revision-id: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
    parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bug-256409
    timestamp: Tue 2008-08-12 17:19:29 +1000
    message:
      Tighten up the handling of carried-over inventory entries.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
-------------- next part --------------

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


More information about the bazaar-commits mailing list