Rev 1913: (mbp) merge from 0.9, update for 0.10 in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Aug 14 05:29:57 BST 2006


------------------------------------------------------------
revno: 1913
revision-id: pqm at pqm.ubuntu.com-20060814042957-3fa43995db57512a
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
parent: mbp at sourcefrog.net-20060814041110-afce2c0833c52452
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-08-14 05:29:57 +0100
message:
  (mbp) merge from 0.9, update for 0.10
added:
  bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060814041110-afce2c0833c52452
    parent: mbp at sourcefrog.net-20060814040945-414f329d15cd8d58
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Mon 2006-08-14 14:11:10 +1000
    message:
      Update version to 0.10dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060814040945-414f329d15cd8d58
    parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
    parent: pqm at pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Mon 2006-08-14 14:09:45 +1000
    message:
      [merge] changes from 0.9 release
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
    parent: pqm at pqm.ubuntu.com-20060810013816-914bb9b7a31e8fd9
    parent: mbp at sourcefrog.net-20060811100344-607e61c217f0dbae
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.9
    timestamp: Fri 2006-08-11 11:21:08 +0100
    message:
      (mbp) 0.9 release
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060811100344-607e61c217f0dbae
        parent: mbp at sourcefrog.net-20060811091211-24dce8250b355044
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.release
        timestamp: Fri 2006-08-11 20:03:44 +1000
        message:
          Fix format warning inside test suite and add test
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060811091211-24dce8250b355044
        parent: mbp at sourcefrog.net-20060811091047-573d501a62dbe1dc
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.release
        timestamp: Fri 2006-08-11 19:12:11 +1000
        message:
          Set version for 0.9
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060811091047-573d501a62dbe1dc
        parent: mbp at sourcefrog.net-20060810022335-912574bb3ea731ec
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.release
        timestamp: Fri 2006-08-11 19:10:47 +1000
        message:
          Give a warning on access to old repository formats
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060810022335-912574bb3ea731ec
        parent: mbp at sourcefrog.net-20060810011616-d74881eba696e746
        parent: john at arbash-meinel.com-20060731225344-ab912563f5b886a0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.release
        timestamp: Thu 2006-08-10 12:23:35 +1000
        message:
          Merge invalid-parent fix from John
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060731225344-ab912563f5b886a0
        parent: john at arbash-meinel.com-20060728001755-43e42832fd5ffca7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: inaccessible-parent-52976
        timestamp: Mon 2006-07-31 17:53:44 -0500
        message:
          Test that the right thing happens when clone/sprout is done with an invalid parent
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060728001755-43e42832fd5ffca7
        parent: john at arbash-meinel.com-20060714151801-38dffed7343ab5e6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: inaccessible-parent-52976
        timestamp: Thu 2006-07-27 19:17:55 -0500
        message:
          Test that we copy the parent across properly (if it is available)
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060714151801-38dffed7343ab5e6
        parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: inaccessible-parent-52976
        timestamp: Fri 2006-07-14 10:18:01 -0500
        message:
          Let Branch.get_parent() return None if parent is not accessible, (bug #52976)
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060810013816-914bb9b7a31e8fd9
    parent: pqm at pqm.ubuntu.com-20060802010309-b3f3e3546bd7e955
    parent: mbp at sourcefrog.net-20060810011616-d74881eba696e746
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.9
    timestamp: Thu 2006-08-10 02:38:16 +0100
    message:
      (mbp) fix deprecation warning
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20060810011616-d74881eba696e746
        parent: pqm at pqm.ubuntu.com-20060802010309-b3f3e3546bd7e955
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: bzr.mbp.release
        timestamp: Thu 2006-08-10 11:16:16 +1000
        message:
          compare_trees is deprecated in 0.9 not 0.10
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060802010309-b3f3e3546bd7e955
    parent: pqm at pqm.ubuntu.com-20060801073926-e0347d00e17d95fb
    parent: mbp at sourcefrog.net-20060801070245-caa752ddf3311bb2
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.9
    timestamp: Wed 2006-08-02 02:03:09 +0100
    message:
      (mbp) prepare 0.9 release
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060801070245-caa752ddf3311bb2
    parent: pqm at pqm.ubuntu.com-20060801061040-2f3d87b801bc8c97
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.release
    timestamp: Tue 2006-08-01 17:02:45 +1000
    message:
      Prepare for 0.9 release



More information about the bazaar-commits mailing list