Rev 2002: merge bzr-0.10 into bzr.dev in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Sep 12 23:51:51 BST 2006


------------------------------------------------------------
revno: 2002
revision-id: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 23:51:50 +0100
message:
  merge bzr-0.10 into bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  README                         README-20050309040720-8f368abf9f346b9d
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
    parent: john at arbash-meinel.com-20060912215631-b827909408542a9b
    parent: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-09-12 17:05:26 -0500
    message:
      [merge] typo fix from Jelmer
        ------------------------------------------------------------
        merged: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
        parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Tue 2006-09-12 21:25:01 +0000
        message:
          Fix typo in encoding warning.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060912215631-b827909408542a9b
    parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
    parent: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-09-12 16:56:31 -0500
    message:
      merge bzr-0.10 into bzr.dev
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
    parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
    parent: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.10
    timestamp: Mon 2006-09-04 01:59:19 +0100
    message:
      (robertc) Turn bzr 0.10rc2 into 0.10 final.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
        parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 0.10
        timestamp: Mon 2006-09-04 10:47:38 +1000
        message:
          (robertc) Turn bzr 0.10rc2 into 0.10 final.
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
    parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
    parent: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.10
    timestamp: Tue 2006-08-29 02:04:26 +0100
    message:
      The bzr selftest was failing on installed versions due to a bug in a new
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
        parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: 0.10
        timestamp: Tue 2006-08-29 10:52:14 +1000
        message:
          The bzr selftest was failing on installed versions due to a bug in a new
          test helper. (John Arbash Meinel, Robert Collins, #58057)
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
    parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
    parent: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: 0.10
    timestamp: Mon 2006-08-28 02:17:24 +0100
    message:
      (robertc) Update version strings for 0.10rc1.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
    parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: 0.10
    timestamp: Mon 2006-08-28 11:03:33 +1000
    message:
      Update version strings for 0.10rc1.



More information about the bazaar-commits mailing list