Rev 3599: Merge in 1.6 tip in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_enotdir

John Arbash Meinel john at arbash-meinel.com
Wed Aug 13 18:26:06 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_enotdir

------------------------------------------------------------
revno: 3599
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.1.13
    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: 3596.13.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: 3596.1.12
    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: 3596.7.11
        revision-id: jelmer at samba.org-20080809004530-v2g6mrvl4bc1tae1
        parent: pqm at pqm.ubuntu.com-20080808061719-ixk3x48n198814tg
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Sat 2008-08-09 02:45:30 +0200
        message:
          Fix copying of root revision in inventory.
        modified:
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
        ------------------------------------------------------------
        revno: 3596.7.10
        revision-id: pqm at pqm.ubuntu.com-20080808061719-ixk3x48n198814tg
        parent: pqm at pqm.ubuntu.com-20080808024534-ff7wyd3vnhtpbat2
        parent: robertc at robertcollins.net-20080808054444-s4er0rqgs07nbcpv
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Fri 2008-08-08 07:17:19 +0100
        message:
          (robertc) The help for bzr ignored now sugests bzr ls --ignored.
          	(Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
            ------------------------------------------------------------
            revno: 3596.12.2
            revision-id: robertc at robertcollins.net-20080808054444-s4er0rqgs07nbcpv
            parent: robertc at robertcollins.net-20080805060140-ckkbituih3srpm06
            parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: integration
            timestamp: Fri 2008-08-08 15:44:44 +1000
            message:
              Merge to resolve conflicts in NEWS.
            added:
              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/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              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/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
            ------------------------------------------------------------
            revno: 3596.12.1
            revision-id: robertc at robertcollins.net-20080805060140-ckkbituih3srpm06
            parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: 3834
            timestamp: Tue 2008-08-05 16:01:40 +1000
            message:
               * The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
                 scripting use. (Robert Collins, #3834)
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3596.7.9
        revision-id: pqm at pqm.ubuntu.com-20080808024534-ff7wyd3vnhtpbat2
        parent: pqm at pqm.ubuntu.com-20080807233123-dgabwwjxlfwzvz51
        parent: john at arbash-meinel.com-20080808021019-e08to54j55sumn1g
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Fri 2008-08-08 03:45:34 +0100
        message:
          (jam) In reference to bug #232188,
          	always pick a revision which modified a line,
          	rather than a merge revision.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
            ------------------------------------------------------------
            revno: 3588.3.2
            revision-id: john at arbash-meinel.com-20080808021019-e08to54j55sumn1g
            parent: john at arbash-meinel.com-20080729165043-i7acukekx2luhcru
            parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: simple_annotate
            timestamp: Thu 2008-08-07 21:10:19 -0500
            message:
              Merge bzr.dev 3613, resolve NEWS
            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/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              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/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
              bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
              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/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
              bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
              bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
              bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
              bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
              bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
              bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
              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_options.py   testoptions.py-20051014093702-96457cfc86319a8f
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
              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/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/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
              doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
            ------------------------------------------------------------
            revno: 3588.3.1
            revision-id: john at arbash-meinel.com-20080729165043-i7acukekx2luhcru
            parent: pqm at pqm.ubuntu.com-20080729093250-b1g7zu2k1pj0mswe
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: simple_annotate
            timestamp: Tue 2008-07-29 11:50:43 -0500
            message:
              Simple patch to the annotate logic to handle bug #232188
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
              bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
        ------------------------------------------------------------
        revno: 3596.7.8
        revision-id: pqm at pqm.ubuntu.com-20080807233123-dgabwwjxlfwzvz51
        parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
        parent: john at arbash-meinel.com-20080807222648-ako39zeldqibnk40
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Fri 2008-08-08 00:31:23 +0100
        message:
          (jam) Fix dotted revno counting for root descendants.
        modified:
          bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
            ------------------------------------------------------------
            revno: 3596.11.1
            revision-id: john at arbash-meinel.com-20080807222648-ako39zeldqibnk40
            parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: correct_ghost_revnos
            timestamp: Thu 2008-08-07 17:26:48 -0500
            message:
              Fix the merge_sort code so that it properly increments.
              We had a small bug where if you had branches descend from new
              roots, as well as sub-branches within them, the branch counter
              would skip, and then repeat itself. (the root was a post-increment,
              while sub-branches were pre-increment.)
              This changes both to be pre-increment.
            modified:
              bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
              bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
        ------------------------------------------------------------
        revno: 3596.7.7
        revision-id: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
        parent: pqm at pqm.ubuntu.com-20080806224913-zg129xmi6x8045k3
        parent: andrew.bennetts at canonical.com-20080807002843-jchnn2ffak6ushpb
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Thu 2008-08-07 01:57:17 +0100
        message:
          Make 'bzr upgrade' work over HPSS. (Andrew Bennetts)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
            ------------------------------------------------------------
            revno: 3577.4.3
            revision-id: andrew.bennetts at canonical.com-20080807002843-jchnn2ffak6ushpb
            parent: andrew.bennetts at canonical.com-20080807002538-mtl1fcgy2fdabha4
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: upgrade-over-hpss
            timestamp: Thu 2008-08-07 10:28:43 +1000
            message:
              Add NEWS entry.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3577.4.2
            revision-id: andrew.bennetts at canonical.com-20080807002538-mtl1fcgy2fdabha4
            parent: andrew.bennetts at canonical.com-20080725031211-3oirb20ag3xk9i59
            parent: pqm at pqm.ubuntu.com-20080806224913-zg129xmi6x8045k3
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: upgrade-over-hpss
            timestamp: Thu 2008-08-07 10:25:38 +1000
            message:
              Merge from bzr.dev.
            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/_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/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              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/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              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/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_commit.py test_commit.py-20060212094538-ae88fc861d969db0
              bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
              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/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_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
              bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
              bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
              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_options.py   testoptions.py-20051014093702-96457cfc86319a8f
              bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
              bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
              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/transform.py            transform.py-20060105172343-dd99e54394d91687
              bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
              bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
              bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
              doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
              tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
            ------------------------------------------------------------
            revno: 3577.4.1
            revision-id: andrew.bennetts at canonical.com-20080725031211-3oirb20ag3xk9i59
            parent: pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: upgrade-over-hpss
            timestamp: Fri 2008-07-25 13:12:11 +1000
            message:
              Make 'bzr upgrade' work over HPSS.
            modified:
              bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
              bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
        ------------------------------------------------------------
        revno: 3596.7.6
        revision-id: pqm at pqm.ubuntu.com-20080806224913-zg129xmi6x8045k3
        parent: pqm at pqm.ubuntu.com-20080806215733-qiem34zrdhgcq8ap
        parent: andrew.bennetts at canonical.com-20080805143514-rmx7hxd3mt40fb44
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-08-06 23:49:13 +0100
        message:
          Remove duplicated class definitions and remove unused imports from
          	pack_repo.py. (Andrew Bennetts)
        modified:
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
            ------------------------------------------------------------
            revno: 3596.10.1
            revision-id: andrew.bennetts at canonical.com-20080805143514-rmx7hxd3mt40fb44
            parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
            committer: Andrew Bennetts <andrew.bennetts at canonical.com>
            branch nick: dupe-code
            timestamp: Wed 2008-08-06 00:35:14 +1000
            message:
              Remove duplicated class definitions, remove unused imports.
            modified:
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
        ------------------------------------------------------------
        revno: 3596.7.5
        revision-id: pqm at pqm.ubuntu.com-20080806215733-qiem34zrdhgcq8ap
        parent: pqm at pqm.ubuntu.com-20080806212834-ttevmjkwyafz4qe0
        parent: benjamin.peterson at usfamily.net-20080722143227-88mqht2ya0ogb104
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-08-06 22:57:33 +0100
        message:
          (Benjamin Peterson) Document how to rename tags
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
            ------------------------------------------------------------
            revno: 3566.2.2
            revision-id: benjamin.peterson at usfamily.net-20080722143227-88mqht2ya0ogb104
            parent: benjamin.peterson at usfamily.net-20080721172009-8nrvntbcr7r2nzlk
            committer: Benjamin Peterson <benjamin.peterson at usfamily.net>
            branch nick: tag-rename-documentation
            timestamp: Tue 2008-07-22 09:32:27 -0500
            message:
              fix markup
            modified:
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
            ------------------------------------------------------------
            revno: 3566.2.1
            revision-id: benjamin.peterson at usfamily.net-20080721172009-8nrvntbcr7r2nzlk
            parent: pqm at pqm.ubuntu.com-20080721092720-z0bvnt4ljysbqjis
            committer: Benjamin Peterson <benjamin.peterson at usfamily.net>
            branch nick: tag-rename-document
            timestamp: Mon 2008-07-21 12:20:09 -0500
            message:
              document how the rename tags
            modified:
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3596.7.4
        revision-id: pqm at pqm.ubuntu.com-20080806212834-ttevmjkwyafz4qe0
        parent: pqm at pqm.ubuntu.com-20080806205754-tyo3u7h84tgr0h9k
        parent: john at arbash-meinel.com-20080806203424-6b9o4ijtzupf0bjd
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-08-06 22:28:34 +0100
        message:
          (Christophe Troestler) Add another case for detecting for FileExists
          	(bug #123475)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
            ------------------------------------------------------------
            revno: 3596.9.1
            revision-id: john at arbash-meinel.com-20080806203424-6b9o4ijtzupf0bjd
            parent: pqm at pqm.ubuntu.com-20080806085554-9e0l5crd6yv0kxy8
            parent: christophe.troestler at umh.ac.be-20080718201920-lvt8l822l4v4qs4z
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: push-sftp
            timestamp: Wed 2008-08-06 15:34:24 -0500
            message:
              Merge Christophe Troestler's fix for SFTP IO Error translation.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
            ------------------------------------------------------------
            revno: 3565.4.2
            revision-id: christophe.troestler at umh.ac.be-20080718201920-lvt8l822l4v4qs4z
            parent: christophe.troestler at umh.ac.be-20080718195108-0kgfigpaqipeq71e
            committer: Christophe Troestler <Christophe.Troestler at umh.ac.be>
            branch nick: push-sftp
            timestamp: Fri 2008-07-18 22:19:20 +0200
            message:
              [Bug #123475] Added news entry.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 3565.4.1
            revision-id: christophe.troestler at umh.ac.be-20080718195108-0kgfigpaqipeq71e
            parent: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
            committer: Christophe Troestler <Christophe.Troestler at umh.ac.be>
            branch nick: push-sftp
            timestamp: Fri 2008-07-18 21:51:08 +0200
            message:
              [Bug #123475] SFTPTransport._translate_io_exception: better detection
              of the `FileExists' case.
            modified:
              bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
        ------------------------------------------------------------
        revno: 3596.7.3
        revision-id: pqm at pqm.ubuntu.com-20080806205754-tyo3u7h84tgr0h9k
        parent: pqm at pqm.ubuntu.com-20080806085554-9e0l5crd6yv0kxy8
        parent: jw+debian at jameswestby.net-20080802161123-70e89xwj0sccql1p
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-08-06 21:57:54 +0100
        message:
          (James Westby) Make TreeTransform.apply() update the WT for kind
          	changes.
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3590.3.5
            revision-id: jw+debian at jameswestby.net-20080802161123-70e89xwj0sccql1p
            parent: jw+debian at jameswestby.net-20080801161059-xbtyoclmjhaf13qz
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev.transform
            timestamp: Sat 2008-08-02 17:11:23 +0100
            message:
              Use HardlinkFeature for the hardlink test.
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
            ------------------------------------------------------------
            revno: 3590.3.4
            revision-id: jw+debian at jameswestby.net-20080801161059-xbtyoclmjhaf13qz
            parent: jw+debian at jameswestby.net-20080731193813-z0u37e3l0j6u0xyj
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev.transform
            timestamp: Fri 2008-08-01 17:10:59 +0100
            message:
              Add a test for creating hardlinks as well.
              
              Also, don't keep state, but calculate all of the kind changes
              at apply time.
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3590.3.3
            revision-id: jw+debian at jameswestby.net-20080731193813-z0u37e3l0j6u0xyj
            parent: jw+debian at jameswestby.net-20080731172238-ba5br3gjk2mjkarb
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev.transform
            timestamp: Thu 2008-07-31 20:38:13 +0100
            message:
              Make ->file changes work as well.
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3590.3.2
            revision-id: jw+debian at jameswestby.net-20080731172238-ba5br3gjk2mjkarb
            parent: jw+debian at jameswestby.net-20080731164241-itsqths2azzc655b
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev.transform
            timestamp: Thu 2008-07-31 18:22:38 +0100
            message:
              Handle ->symlink changes as well.
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
            ------------------------------------------------------------
            revno: 3590.3.1
            revision-id: jw+debian at jameswestby.net-20080731164241-itsqths2azzc655b
            parent: pqm at pqm.ubuntu.com-20080729170343-hy20k9g6euzsz04s
            committer: James Westby <jw+debian at jameswestby.net>
            branch nick: bzr.dev
            timestamp: Thu 2008-07-31 17:42:41 +0100
            message:
              Make TreeTransform update the inventory with new kind information.
              
              If an entry simply changes kind in a TreeTransform it wouldn't previously
              be updated in the inventory, leading to a dirstate that didn't match what
              was on disk.
              
              This change makes TreeTransform keep track of kind changes and add an
              inventory_delta entry to change the kind of the entry.
              
              It is only implemented for ->directory changes currently.
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3596.7.2
        revision-id: pqm at pqm.ubuntu.com-20080806085554-9e0l5crd6yv0kxy8
        parent: pqm at pqm.ubuntu.com-20080806073717-dz0d9gglgf8r9996
        parent: mbp at sourcefrog.net-20080806082343-6nh1t7rjjpk5dyps
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-08-06 09:55:54 +0100
        message:
          (mbp) start 1.7
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
            ------------------------------------------------------------
            revno: 3596.8.1
            revision-id: mbp at sourcefrog.net-20080806082343-6nh1t7rjjpk5dyps
            parent: pqm at pqm.ubuntu.com-20080806073717-dz0d9gglgf8r9996
            parent: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
            committer: Martin Pool <mbp at sourcefrog.net>
            branch nick: integration
            timestamp: Wed 2008-08-06 18:23:43 +1000
            message:
              merge back 1.6 and start 1.7
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzr                            bzr.py-20050313053754-5485f144c7006fa6
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3596.7.1
        revision-id: pqm at pqm.ubuntu.com-20080806073717-dz0d9gglgf8r9996
        parent: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
        parent: mbp at sourcefrog.net-20080806070209-08j1bpnnjxqydi09
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2008-08-06 08:37:17 +0100
        message:
          (mbp) merge back NEWS of 1.6b3 release
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3596.1.11
    revision-id: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
    parent: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
    parent: mbp at sourcefrog.net-20080806073930-d12u94cx6d0w0ctt
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.6
    timestamp: Wed 2008-08-06 09:13:05 +0100
    message:
      (mbp) prepare 1.6rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3596.6.2
        revision-id: mbp at sourcefrog.net-20080806073930-d12u94cx6d0w0ctt
        parent: mbp at sourcefrog.net-20080806070209-08j1bpnnjxqydi09
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.6
        timestamp: Wed 2008-08-06 17:39:30 +1000
        message:
          Prepare 1.6rc1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3596.6.1
        revision-id: mbp at sourcefrog.net-20080806070209-08j1bpnnjxqydi09
        parent: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
        parent: mbp at sourcefrog.net-20080717082406-jtexfvbbd0d4eqgv
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.6
        timestamp: Wed 2008-08-06 17:02:09 +1000
        message:
          Merge up news from 1.6b3 and correct misplaced items
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3549.4.2
        revision-id: mbp at sourcefrog.net-20080717082406-jtexfvbbd0d4eqgv
        parent: mbp at sourcefrog.net-20080717081840-m8fra9sylk1xdsyx
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.6
        timestamp: Thu 2008-07-17 18:24:06 +1000
        message:
          Correct the version number in NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3549.4.1
        revision-id: mbp at sourcefrog.net-20080717081840-m8fra9sylk1xdsyx
        parent: mbp at sourcefrog.net-20080717080025-bd9k6gpkkkntipwr
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.6
        timestamp: Thu 2008-07-17 18:18:40 +1000
        message:
          Prepare 1.6b3
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3596.1.10
    revision-id: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
    parent: pqm at pqm.ubuntu.com-20080805062143-idm263sn4iw3cmkw
    parent: robertc at robertcollins.net-20080718112738-ayyj205j3lo2nve1
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-08-05 21:29:41 +0100
    message:
      (robertc) Do not generate a revision number map for tags if there are
      	no tags. (Robert Collins)
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3553.1.1
        revision-id: robertc at robertcollins.net-20080718112738-ayyj205j3lo2nve1
        parent: pqm at pqm.ubuntu.com-20080717073312-reglpowwyo671081
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: misc-fixen
        timestamp: Fri 2008-07-18 21:27:38 +1000
        message:
          Do not scan history for tags when none are present.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3596.1.9
    revision-id: pqm at pqm.ubuntu.com-20080805062143-idm263sn4iw3cmkw
    parent: pqm at pqm.ubuntu.com-20080805044416-k5w5uuy3l785e7cm
    parent: mbp at sourcefrog.net-20080804075541-jka7smxkix7ozvb1
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-08-05 07:21:43 +0100
    message:
      (mbp) test upgrade with stacking
    added:
      bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
        ------------------------------------------------------------
        revno: 3596.5.2
        revision-id: mbp at sourcefrog.net-20080804075541-jka7smxkix7ozvb1
        parent: mbp at sourcefrog.net-20080804064759-1vdd56edlca9j2rq
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: stacking
        timestamp: Mon 2008-08-04 17:55:41 +1000
        message:
          Make tests for stacked upgrade scenario-based
        added:
          bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
        ------------------------------------------------------------
        revno: 3596.5.1
        revision-id: mbp at sourcefrog.net-20080804064759-1vdd56edlca9j2rq
        parent: pqm at pqm.ubuntu.com-20080804032751-myaykx8azatkvlf8
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: stacking
        timestamp: Mon 2008-08-04 16:47:59 +1000
        message:
          Fix and test for problem upgrading stacked branches
        modified:
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
    ------------------------------------------------------------
    revno: 3596.1.8
    revision-id: pqm at pqm.ubuntu.com-20080805044416-k5w5uuy3l785e7cm
    parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
    parent: robertc at robertcollins.net-20080805041043-6krwcxp2ebhzbumy
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-08-05 05:44:16 +0100
    message:
      (robertc) Further tweaks to tests and comments in the commit excludes
      	feature. (Robert Collins, Andrew Bennetts)
    modified:
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 3596.4.1
        revision-id: robertc at robertcollins.net-20080805041043-6krwcxp2ebhzbumy
        parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Tue 2008-08-05 14:10:43 +1000
        message:
          Further tweaks to tests and comments in the commit excludes feature.
        modified:
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
    ------------------------------------------------------------
    revno: 3596.1.7
    revision-id: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
    parent: pqm at pqm.ubuntu.com-20080804032751-myaykx8azatkvlf8
    parent: robertc at robertcollins.net-20080805004328-ilb5p3l9lbmix8oe
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-08-05 02:14:07 +0100
    message:
      (robertc) Implement a --exclude option for commit which allows the
      	exclusion of paths from the commit change detection logic.
      	(Robert Collins, \#3117)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 3596.3.5
        revision-id: robertc at robertcollins.net-20080805004328-ilb5p3l9lbmix8oe
        parent: robertc at robertcollins.net-20080805000619-bfje55v540epfkvr
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Tue 2008-08-05 10:43:28 +1000
        message:
          Fixups for test_options due to the changes to cmd_commit - insta-review by spiv.
        modified:
          bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
        ------------------------------------------------------------
        revno: 3596.3.4
        revision-id: robertc at robertcollins.net-20080805000619-bfje55v540epfkvr
        parent: robertc at robertcollins.net-20080804224118-pgxd6gg6a54luvrv
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 3117
        timestamp: Tue 2008-08-05 10:06:19 +1000
        message:
          Andrew's review feedback.
        modified:
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 3596.3.3
        revision-id: robertc at robertcollins.net-20080804224118-pgxd6gg6a54luvrv
        parent: robertc at robertcollins.net-20080804220734-xoo8j0kt3bdy26s9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 3117
        timestamp: Tue 2008-08-05 08:41:18 +1000
        message:
          Document the change in the command lines use of MutablelTree and bump the API minimum version.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3596.3.2
        revision-id: robertc at robertcollins.net-20080804220734-xoo8j0kt3bdy26s9
        parent: robertc at robertcollins.net-20080804072951-tdue3y4bp9893yx9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 3117
        timestamp: Tue 2008-08-05 08:07:34 +1000
        message:
          Review feedback : test for PointlessCommit and that the example given in the help (excluding a subtree of a specified tree) does in fact work.
        modified:
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
        ------------------------------------------------------------
        revno: 3596.3.1
        revision-id: robertc at robertcollins.net-20080804072951-tdue3y4bp9893yx9
        parent: pqm at pqm.ubuntu.com-20080804032751-myaykx8azatkvlf8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 3117
        timestamp: Mon 2008-08-04 17:29:51 +1000
        message:
          Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
    ------------------------------------------------------------
    revno: 3596.1.6
    revision-id: pqm at pqm.ubuntu.com-20080804032751-myaykx8azatkvlf8
    parent: pqm at pqm.ubuntu.com-20080803020241-7pa0v2aoubnvh68y
    parent: mbp at sourcefrog.net-20080804025444-su1om7v592vh8udp
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-08-04 04:27:51 +0100
    message:
      (mbp) clean up and separate pack repository tests
    added:
      bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
        ------------------------------------------------------------
        revno: 3582.3.4
        revision-id: mbp at sourcefrog.net-20080804025444-su1om7v592vh8udp
        parent: mbp at sourcefrog.net-20080801075902-0r6q42i9f5ayh7fd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repository-tests
        timestamp: Mon 2008-08-04 12:54:44 +1000
        message:
          Use cStringIO rather than StringIO
        modified:
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
        ------------------------------------------------------------
        revno: 3582.3.3
        revision-id: mbp at sourcefrog.net-20080801075902-0r6q42i9f5ayh7fd
        parent: mbp at sourcefrog.net-20080801044342-zlnhlt1zc1eel4c1
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: stacking
        timestamp: Fri 2008-08-01 17:59:02 +1000
        message:
          Reenable tests for stacking pack repositories
        modified:
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
        ------------------------------------------------------------
        revno: 3582.3.2
        revision-id: mbp at sourcefrog.net-20080801044342-zlnhlt1zc1eel4c1
        parent: mbp at sourcefrog.net-20080801044030-n3esmvn5hl0ik9nk
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: stacking
        timestamp: Fri 2008-08-01 14:43:42 +1000
        message:
          Add 1.6 formats to pack repository tests
        modified:
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
        ------------------------------------------------------------
        revno: 3582.3.1
        revision-id: mbp at sourcefrog.net-20080801044030-n3esmvn5hl0ik9nk
        parent: mbp at sourcefrog.net-20080801025808-a7w9z04ehmh7051l
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: stacking
        timestamp: Fri 2008-08-01 14:40:30 +1000
        message:
          Split pack repository tests into their own file and use scenarios
        added:
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 3596.1.5
    revision-id: pqm at pqm.ubuntu.com-20080803020241-7pa0v2aoubnvh68y
    parent: pqm at pqm.ubuntu.com-20080801181944-pl10irs3d0p0a5ia
    parent: jelmer at samba.org-20080803003646-2bss0hgb8zrjbtbk
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-08-03 03:02:41 +0100
    message:
      (Jelmer) Remove recommendation of old format when tags can't be
      	copied.
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
        ------------------------------------------------------------
        revno: 3596.2.1
        revision-id: jelmer at samba.org-20080803003646-2bss0hgb8zrjbtbk
        parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Sun 2008-08-03 02:36:46 +0200
        message:
          Remove recommendation of old format when tags can't be copied.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
    ------------------------------------------------------------
    revno: 3596.1.4
    revision-id: pqm at pqm.ubuntu.com-20080801181944-pl10irs3d0p0a5ia
    parent: pqm at pqm.ubuntu.com-20080801151300-ke9pi1kzij731zm5
    parent: john at arbash-meinel.com-20080801174830-xyg2tor1j4zjklpj
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-08-01 19:19:44 +0100
    message:
      (jam) Add a MultiWalker class to check for changes between >2 trees
    modified:
      bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.13
        revision-id: john at arbash-meinel.com-20080801174830-xyg2tor1j4zjklpj
        parent: john at arbash-meinel.com-20080801172424-rwe2i959lhuwe4jt
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Fri 2008-08-01 12:48:30 -0500
        message:
          One code path was using a tuple, another a plain path
          we need to support *both*. Relatively simple fix after that.
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.12
        revision-id: john at arbash-meinel.com-20080801172424-rwe2i959lhuwe4jt
        parent: john at arbash-meinel.com-20080801132934-yk7f0pg3ox0um0yc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Fri 2008-08-01 12:24:24 -0500
        message:
          Found some problems in _path_key, and made sure to have proper testing of _cmp_paths_by_dirblock
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3596.1.3
    revision-id: pqm at pqm.ubuntu.com-20080801151300-ke9pi1kzij731zm5
    parent: pqm at pqm.ubuntu.com-20080801080015-2ejfoi6hswx07zm6
    parent: john at arbash-meinel.com-20080801132934-yk7f0pg3ox0um0yc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-08-01 16:13:00 +0100
    message:
      (jam) Add a MultiWalker class to check for changes between >2 trees
    modified:
      bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.11
        revision-id: john at arbash-meinel.com-20080801132934-yk7f0pg3ox0um0yc
        parent: john at arbash-meinel.com-20080630232157-j38i11dq21da6ewo
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Fri 2008-08-01 08:29:34 -0500
        message:
          Cleanups suggested by Ian
        modified:
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.10
        revision-id: john at arbash-meinel.com-20080630232157-j38i11dq21da6ewo
        parent: john at arbash-meinel.com-20080630225434-z1fw5e24joflaba1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 18:21:57 -0500
        message:
          A mix-matched commit with things moving in each tree.
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
        ------------------------------------------------------------
        revno: 3514.3.9
        revision-id: john at arbash-meinel.com-20080630225434-z1fw5e24joflaba1
        parent: john at arbash-meinel.com-20080630222058-vomk3xczseqxwt9a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 17:54:34 -0500
        message:
          Refactor the large function into multiple small ones.
        modified:
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.8
        revision-id: john at arbash-meinel.com-20080630222058-vomk3xczseqxwt9a
        parent: john at arbash-meinel.com-20080630220902-t27mpzos1f6kgof8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 17:20:58 -0500
        message:
          Start trying to refactor the big function into smaller ones.
        modified:
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.7
        revision-id: john at arbash-meinel.com-20080630220902-t27mpzos1f6kgof8
        parent: john at arbash-meinel.com-20080630220745-59npdpq6s44ue8in
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 17:09:02 -0500
        message:
          comment
        modified:
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.6
        revision-id: john at arbash-meinel.com-20080630220745-59npdpq6s44ue8in
        parent: john at arbash-meinel.com-20080630220425-vyug6b2sb2yqzz86
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 17:07:45 -0500
        message:
          check when there are 3 other trees, rather than just 2
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
        ------------------------------------------------------------
        revno: 3514.3.5
        revision-id: john at arbash-meinel.com-20080630220425-vyug6b2sb2yqzz86
        parent: john at arbash-meinel.com-20080630213204-w4f20aico7ta1bs1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 17:04:25 -0500
        message:
          Handle some edge cases when we have multiple other trees.
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.4
        revision-id: john at arbash-meinel.com-20080630213204-w4f20aico7ta1bs1
        parent: john at arbash-meinel.com-20080630212750-h05siuu3vd40dhhf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 16:32:04 -0500
        message:
          Handle more cases when the other tree has extra nodes.
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.3
        revision-id: john at arbash-meinel.com-20080630212750-h05siuu3vd40dhhf
        parent: john at arbash-meinel.com-20080630194801-gdodhpossmf1n85a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 16:27:50 -0500
        message:
          Handle when the other tree has extra nodes, and we need to yield them.
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.2
        revision-id: john at arbash-meinel.com-20080630194801-gdodhpossmf1n85a
        parent: john at arbash-meinel.com-20080630192436-hv4ppxq7dpp38mii
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 14:48:01 -0500
        message:
          Handle the case when a record is missing in base
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3514.3.1
        revision-id: john at arbash-meinel.com-20080630192436-hv4ppxq7dpp38mii
        parent: pqm at pqm.ubuntu.com-20080630055535-42tx43kb228k4p94
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: multi_walker
        timestamp: Mon 2008-06-30 14:24:36 -0500
        message:
          Start working on a special walker that can iterate several trees at once.
        modified:
          bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3596.1.2
    revision-id: pqm at pqm.ubuntu.com-20080801080015-2ejfoi6hswx07zm6
    parent: pqm at pqm.ubuntu.com-20080801043811-0jr7eru0frsrso4p
    parent: andrew.bennetts at canonical.com-20080801073020-svi1h6yq6d0gtk9o
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-08-01 09:00:15 +0100
    message:
      Fix bug #251871: Use source_branch.sprout in BzrDir.sprout when
      	possible. (Andrew Bennetts)
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
        ------------------------------------------------------------
        revno: 3583.1.2
        revision-id: andrew.bennetts at canonical.com-20080801073020-svi1h6yq6d0gtk9o
        parent: andrew.bennetts at canonical.com-20080731083525-3moul1ak25t2eaoj
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: svn-branching
        timestamp: Fri 2008-08-01 17:30:20 +1000
        message:
          Add test for fix.
        modified:
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
        ------------------------------------------------------------
        revno: 3583.1.1
        revision-id: andrew.bennetts at canonical.com-20080731083525-3moul1ak25t2eaoj
        parent: pqm at pqm.ubuntu.com-20080728072348-iu8k0mg3zq36v1nd
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: svn-branching
        timestamp: Thu 2008-07-31 18:35:25 +1000
        message:
          Use source_branch.sprout in BzrDir.sprout when possible.
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3596.1.1
    revision-id: pqm at pqm.ubuntu.com-20080801043811-0jr7eru0frsrso4p
    parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
    parent: mbp at sourcefrog.net-20080801040618-3xw6v4sag0ilhiak
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-08-01 05:38:11 +0100
    message:
      (mbp) add tests for deltas over repository boundaries
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
    ------------------------------------------------------------
    revno: 3582.1.16
    revision-id: mbp at sourcefrog.net-20080801040618-3xw6v4sag0ilhiak
    parent: mbp at sourcefrog.net-20080801025808-a7w9z04ehmh7051l
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Fri 2008-08-01 14:06:18 +1000
    message:
      Review feedback and news entry
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3582.1.15
    revision-id: mbp at sourcefrog.net-20080801025808-a7w9z04ehmh7051l
    parent: mbp at sourcefrog.net-20080801025454-a58o8i2udfrs52fv
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Fri 2008-08-01 12:58:08 +1000
    message:
      Comments and tests for repository stacking
    modified:
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
    ------------------------------------------------------------
    revno: 3582.1.14
    revision-id: mbp at sourcefrog.net-20080801025454-a58o8i2udfrs52fv
    parent: mbp at sourcefrog.net-20080731062644-aw6t3c55qi9sz0a6
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Fri 2008-08-01 12:54:54 +1000
    message:
      Clearer comments about KnitVersionedFile stacking
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3582.1.13
    revision-id: mbp at sourcefrog.net-20080731062644-aw6t3c55qi9sz0a6
    parent: mbp at sourcefrog.net-20080731061851-od3uqmaok1g8q4yo
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Thu 2008-07-31 16:26:44 +1000
    message:
      Better comment about fetching to or from stacked repositories
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3582.1.12
    revision-id: mbp at sourcefrog.net-20080731061851-od3uqmaok1g8q4yo
    parent: mbp at sourcefrog.net-20080731053817-omtssy130cyoitmd
    parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Thu 2008-07-31 16:18:51 +1000
    message:
      merge from trunk
    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/branchbuilder.py        branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      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/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      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_status.py teststatus.py-20050712014354-508855eb9f29f7dc
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
      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_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 3582.1.11
    revision-id: mbp at sourcefrog.net-20080731053817-omtssy130cyoitmd
    parent: mbp at sourcefrog.net-20080731051345-owj7j6cpd0e8dg7m
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Thu 2008-07-31 15:38:17 +1000
    message:
      doc
    modified:
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
    ------------------------------------------------------------
    revno: 3582.1.10
    revision-id: mbp at sourcefrog.net-20080731051345-owj7j6cpd0e8dg7m
    parent: mbp at sourcefrog.net-20080731044315-y0fqfii3ssyl408y
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Thu 2008-07-31 15:13:45 +1000
    message:
      Add failing tets for pull into stacked repository
    modified:
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
    ------------------------------------------------------------
    revno: 3582.1.9
    revision-id: mbp at sourcefrog.net-20080731044315-y0fqfii3ssyl408y
    parent: mbp at sourcefrog.net-20080730113509-qogtvyvsmv495hid
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Thu 2008-07-31 14:43:15 +1000
    message:
      Make autopack-stacked test use larger files; still does not fail
    modified:
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
    ------------------------------------------------------------
    revno: 3582.1.8
    revision-id: mbp at sourcefrog.net-20080730113509-qogtvyvsmv495hid
    parent: mbp at sourcefrog.net-20080729110516-kela9tkqwtkds96k
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: stacking
    timestamp: Wed 2008-07-30 21:35:09 +1000
    message:
      Add test for repeated commits into packed repository
    modified:
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
-------------- next part --------------

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


More information about the bazaar-commits mailing list