Rev 2048: Add support for bundles and testaments with roots in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Sep 27 21:27:48 BST 2006


------------------------------------------------------------
revno: 2048
revision-id: pqm at pqm.ubuntu.com-20060927202746-942eb21d12b7edc7
parent: pqm at pqm.ubuntu.com-20060927194846-b26e0ca2dd3f8519
parent: abentley at panoramicfeedback.com-20060927201608-a22549bfaefd3bd1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 21:27:46 +0100
message:
  Add support for bundles and testaments with roots
added:
  bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
modified:
  bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
  bzrlib/testament.py            testament.py-20051011100429-6d319a18183b13c8
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060927201608-a22549bfaefd3bd1
    parent: abentley at panoramicfeedback.com-20060926134043-05215c1c01c4efb5
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Wed 2006-09-27 16:16:08 -0400
    message:
      Fix copyright statements
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060926134043-05215c1c01c4efb5
    parent: abentley at panoramicfeedback.com-20060926132839-cee32159ab268eeb
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Tue 2006-09-26 09:40:43 -0400
    message:
      Remove the check-parent patch
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060926132839-cee32159ab268eeb
    parent: aaron.bentley at utoronto.ca-20060922020810-b21fa5e0fd454f30
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Tue 2006-09-26 09:28:39 -0400
    message:
      Changes from review
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060922020810-b21fa5e0fd454f30
    parent: aaron.bentley at utoronto.ca-20060922015350-0bbc48a29fff8987
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 22:08:10 -0400
    message:
      Add supports_rich_root member to repository
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060922015350-0bbc48a29fff8987
    parent: aaron.bentley at utoronto.ca-20060922012015-8db4d7b46e8ced08
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 21:53:50 -0400
    message:
      Cleanups
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060922012015-8db4d7b46e8ced08
    parent: aaron.bentley at utoronto.ca-20060922010530-632a5f35fb488eb2
    parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 21:20:15 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060922010530-632a5f35fb488eb2
    parent: aaron.bentley at utoronto.ca-20060921234714-d8de2d5715f34555
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 21:05:30 -0400
    message:
      Ensure that new-model revisions aren't installed into old-model repos
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060921234714-d8de2d5715f34555
    parent: aaron.bentley at utoronto.ca-20060921233732-911d45ab9049a64c
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 19:47:14 -0400
    message:
      Test 0.9 bundles for knit format1 and knit format2
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060921233732-911d45ab9049a64c
    parent: aaron.bentley at utoronto.ca-20060921232303-456dc6bfcc66f870
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 19:37:32 -0400
    message:
      Stop using get_revision_id to make bundles
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060921232303-456dc6bfcc66f870
    parent: abentley at panoramicfeedback.com-20060921220258-50026dc4220c8b11
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 19:23:03 -0400
    message:
      Got 0.9 bundles working, with root included by changes_from
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060921220258-50026dc4220c8b11
    parent: abentley at panoramicfeedback.com-20060921181414-f913391df42bffaf
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 18:02:58 -0400
    message:
      More work on bundles
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060921181414-f913391df42bffaf
    parent: abentley at panoramicfeedback.com-20060921174020-5a6a95957ad5dd7b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 14:14:14 -0400
    message:
      Bundle 0.9 uses Testament 3 strict
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060921174020-5a6a95957ad5dd7b
    parent: abentley at panoramicfeedback.com-20060921155844-982ba25e0b5450c5
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 13:40:20 -0400
    message:
      Implement testament format 3 strict
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060921155844-982ba25e0b5450c5
    parent: abentley at panoramicfeedback.com-20060921155805-5b3579f9994cd307
    parent: abentley at panoramicfeedback.com-20060921155245-ca4dbd58e85707a8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 11:58:44 -0400
    message:
      Merge error message fix
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060921155245-ca4dbd58e85707a8
        parent: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: check-parents
        timestamp: Thu 2006-09-21 11:52:45 -0400
        message:
          Correct error formatting
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060921155805-5b3579f9994cd307
    parent: aaron.bentley at utoronto.ca-20060921115920-5ae7c3ba4b746348
    parent: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 11:58:05 -0400
    message:
      Merge check-parent fix
        ------------------------------------------------------------
        merged: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
        parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: check-parents
        timestamp: Thu 2006-09-21 11:19:27 -0400
        message:
          Prevent raw copies from corrupting knits by checking parents
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060921115920-5ae7c3ba4b746348
    parent: abentley at panoramicfeedback.com-20060921014844-a86a75c8f813548e
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: format-bumps
    timestamp: Thu 2006-09-21 07:59:20 -0400
    message:
      Bundles now corrupt repositories
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060921014844-a86a75c8f813548e
    parent: abentley at panoramicfeedback.com-20060920184151-6ad695cf843a746b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Wed 2006-09-20 21:48:44 -0400
    message:
      start work on format 0.9 serializer
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060920184151-6ad695cf843a746b
    parent: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: format-bumps
    timestamp: Wed 2006-09-20 14:41:51 -0400
    message:
      Ensure that 0.8 bundles aren't used with KnitRepository2



More information about the bazaar-commits mailing list