Rev 1587: Merge in knit repository use of knits - still not a stable format, but can be experimented with. in /home/robertc/source/baz/integration/

Robert Collins robertc at robertcollins.net
Wed Mar 8 00:20:29 GMT 2006


------------------------------------------------------------
revno: 1587
revision-id: robertc at robertcollins.net-20060308002004-a9950b2fb75d14de
parent: robertc at robertcollins.net-20060307225143-23f74e9de76891a2
parent: robertc at robertcollins.net-20060307235507-d7b3d2659d3eb548
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-08 11:20:04 +1100
message:
  Merge in knit repository use of knits - still not a stable format, but can be experimented with.
removed:
  bzrlib/tests/test_reweave.py   testreweave.py-20051025042437-a2a02abae3551489
added:
  bzrlib/inter.py                inter.py-20060302012326-a57300cb382c618f
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/store/revision/         revision-20060303014707-dc3bdc497f81c395
  bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
  bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
  bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
  bzrlib/store/versioned/        versioned-20060301031435-98ec210ea3dfd86d
  bzrlib/tests/interversionedfile_implementations/ interversionedfile_implementations-20060301230427-f1f3ca8ddd5ff482
  bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
  bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
  bzrlib/tests/revisionstore_implementations/ revisionstore_implementations-20060303020702-1d2e36b63cef2706
  bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
  bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_reweave.py.moved test_reweave.py-20060302012326-a582932ad7879ccd
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
renamed:
  bzrlib/store/weave.py => bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  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/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/identitymap.py          identitymap.py-20051007040721-83e837d831a6636a
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
  bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
  bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
  bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
  bzrlib/transactions.py         transactions.py-20051007010900-f1313d53cf58e223
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  bzrlib/weavefile.py            weavefile.py-20050629135233-2ffe0200f103f6c2
  bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307235507-d7b3d2659d3eb548
    parent: robertc at robertcollins.net-20060307234733-613e502c7967944a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Wed 2006-03-08 10:55:07 +1100
    message:
      Stop reconcile on weaves being quadratic.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307234733-613e502c7967944a
    parent: robertc at robertcollins.net-20060307233858-ee407c954a9c9c53
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Wed 2006-03-08 10:47:33 +1100
    message:
      Only fetch referenced inventories in fetch.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307233858-ee407c954a9c9c53
    parent: robertc at robertcollins.net-20060307222112-e89dff36c5ee5a9e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Wed 2006-03-08 10:38:58 +1100
    message:
      Extra test for joining of version-limited sets.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307222112-e89dff36c5ee5a9e
    parent: robertc at robertcollins.net-20060307203447-b7432f11cbd54c29
    parent: robertc at robertcollins.net-20060307215925-c3ef7a33759a36b4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Wed 2006-03-08 09:21:12 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307203447-b7432f11cbd54c29
    parent: robertc at robertcollins.net-20060307125615-fca7aabbc4771f7e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Wed 2006-03-08 07:34:47 +1100
    message:
      make push preserve tree formats.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307125615-fca7aabbc4771f7e
    parent: robertc at robertcollins.net-20060307123938-f75ff66ebcc0c4d0
    parent: robertc at robertcollins.net-20060307090344-c45880fb69b4df89
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Tue 2006-03-07 23:56:15 +1100
    message:
      Merge in nested progress bars
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307123938-f75ff66ebcc0c4d0
    parent: robertc at robertcollins.net-20060307121732-1a219b872ef18ecc
    parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Tue 2006-03-07 23:39:38 +1100
    message:
      Merge in bzr.dev
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307121732-1a219b872ef18ecc
    parent: robertc at robertcollins.net-20060307021845-571917c17fce6b30
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Tue 2006-03-07 23:17:32 +1100
    message:
      cleanup deprecation warnings and finish conversion so the inventory is knit based too.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060307021845-571917c17fce6b30
    parent: robertc at robertcollins.net-20060306235302-1707f4a372dc885c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Tue 2006-03-07 13:18:45 +1100
    message:
      Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306235302-1707f4a372dc885c
    parent: robertc at robertcollins.net-20060306121242-833c3e347fdfbb32
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Tue 2006-03-07 10:53:02 +1100
    message:
      Nicer progress updates during conversion to knits.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306121242-833c3e347fdfbb32
    parent: robertc at robertcollins.net-20060306121125-4f05992d44e3bda8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 23:12:42 +1100
    message:
      note TODOs
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306121125-4f05992d44e3bda8
    parent: robertc at robertcollins.net-20060306101726-e92c4ad66c719387
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 23:11:25 +1100
    message:
      Convert Knit repositories to use knits.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306101726-e92c4ad66c719387
    parent: robertc at robertcollins.net-20060306093837-b151989e9572895e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 21:17:26 +1100
    message:
      Remove all but fetch references to revision_store, making the repository references that are weave specific use the RevisionTextStore.text_store attribute.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306093837-b151989e9572895e
    parent: robertc at robertcollins.net-20060306071427-359ef15c1d891e84
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 20:38:37 +1100
    message:
      Remove all but fetch references to repository.revision_store.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306071427-359ef15c1d891e84
    parent: robertc at robertcollins.net-20060306064346-4dc4390870d12c5c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 18:14:27 +1100
    message:
      Add total_size to the revision_store api.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306064346-4dc4390870d12c5c
    parent: robertc at robertcollins.net-20060306061914-a3037bc20458f332
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 17:43:46 +1100
    message:
      Add signature text addition to the revisionstore api.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306061914-a3037bc20458f332
    parent: robertc at robertcollins.net-20060306060607-07ee741185ceaee5
    parent: robertc at robertcollins.net-20060306035548-453e2432ec0e8caf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 17:19:14 +1100
    message:
      Merge from upstream.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060306060607-07ee741185ceaee5
    parent: robertc at robertcollins.net-20060304023017-7f5f460efff7d2e8
    parent: robertc at robertcollins.net-20060303132246-5527bd85b7a33fe7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Mon 2006-03-06 17:06:07 +1100
    message:
      Merge in upstream.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060304023017-7f5f460efff7d2e8
    parent: robertc at robertcollins.net-20060303070050-5219f1cd68b5e6b9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Sat 2006-03-04 13:30:17 +1100
    message:
      Make join cheaper for compatibly inconsistent parents.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060303070050-5219f1cd68b5e6b9
    parent: robertc at robertcollins.net-20060303030907-6af33664f8791e78
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Fri 2006-03-03 18:00:50 +1100
    message:
      Add add_revision and get_revision methods to RevisionStore
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060303030907-6af33664f8791e78
    parent: robertc at robertcollins.net-20060303020949-0ddc6f33d0a43943
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Fri 2006-03-03 14:09:07 +1100
    message:
      Move responsibility for repository.has_revision into RevisionStore
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060303020949-0ddc6f33d0a43943
    parent: robertc at robertcollins.net-20060303014722-e890b9bf8628aebf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Fri 2006-03-03 13:09:49 +1100
    message:
      Smoke test for RevisionStore factories creating revision stores.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060303014722-e890b9bf8628aebf
    parent: robertc at robertcollins.net-20060302110115-c7d315c0f2165ac7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Fri 2006-03-03 12:47:22 +1100
    message:
      Add a revision store test adapter.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302110115-c7d315c0f2165ac7
    parent: robertc at robertcollins.net-20060302105124-675e0bed0d749b43
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Thu 2006-03-02 22:01:15 +1100
    message:
      stub out a check for knits.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302105124-675e0bed0d749b43
    parent: robertc at robertcollins.net-20060302091401-2b20f052d4358e3c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Thu 2006-03-02 21:51:24 +1100
    message:
      get knit repositories really using knits for text storage.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302091401-2b20f052d4358e3c
    parent: robertc at robertcollins.net-20060302074346-f6ea05e3f19f6b8b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Thu 2006-03-02 20:14:01 +1100
    message:
      Change knits repositories to use a knit versioned file store for file texts.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302074346-f6ea05e3f19f6b8b
    parent: robertc at robertcollins.net-20060302070836-be71595e05a607b7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Thu 2006-03-02 18:43:46 +1100
    message:
      Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302070836-be71595e05a607b7
    parent: robertc at robertcollins.net-20060302062315-9c274fa5c8201784
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Thu 2006-03-02 18:08:36 +1100
    message:
      remove the weavestore assumptions about the number and nature of files it manages.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302062315-9c274fa5c8201784
    parent: robertc at robertcollins.net-20060302031234-cf6b75961f27c5df
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-knit-stores
    timestamp: Thu 2006-03-02 17:23:15 +1100
    message:
      Prepare weave store to delegate copy details to the versioned file.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302031234-cf6b75961f27c5df
    parent: robertc at robertcollins.net-20060302012622-6d1d0b92fe94d9be
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Thu 2006-03-02 14:12:34 +1100
    message:
      InterVersionedFile implemented.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060302012622-6d1d0b92fe94d9be
    parent: robertc at robertcollins.net-20060301120959-b58a073b9f7f7a00
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Thu 2006-03-02 12:26:22 +1100
    message:
      Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060301120959-b58a073b9f7f7a00
    parent: robertc at robertcollins.net-20060301084035-ce00abd11fe4da31
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-03-01 23:09:59 +1100
    message:
      Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060301084035-ce00abd11fe4da31
    parent: robertc at robertcollins.net-20060301054315-a9edc45a6c4061eb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-03-01 19:40:35 +1100
    message:
      Change weave store to be a versioned store, using WeaveFiles which maintain integrity without needing explicit 'put' operations.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060301054315-a9edc45a6c4061eb
    parent: robertc at robertcollins.net-20060301032623-9d3c073e102f2239
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-03-01 16:43:15 +1100
    message:
      Update versionedfile api tests to ensure that data is available after every operation.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060301032623-9d3c073e102f2239
    parent: robertc at robertcollins.net-20060301031344-b661bf92b4985554
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-03-01 14:26:23 +1100
    message:
      Move WeaveStore down into bzrlib.store.versioned.weave.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060301031344-b661bf92b4985554
    parent: robertc at robertcollins.net-20060301020147-62bb5465f75fbf40
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-03-01 14:13:44 +1100
    message:
      add versioned file clear_cache entry.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060301020147-62bb5465f75fbf40
    parent: robertc at robertcollins.net-20060228083443-f6aae35b7de8f26f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-03-01 13:01:47 +1100
    message:
      Start check tests for knits (pending), and remove dead code.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060228083443-f6aae35b7de8f26f
    parent: robertc at robertcollins.net-20060228082759-d082181cb6fa27e5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Tue 2006-02-28 19:34:43 +1100
    message:
      Remove unused transaction references from knit.py and the versionedfile interface.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060228082759-d082181cb6fa27e5
    parent: robertc at robertcollins.net-20060228074257-a66f0d23e091ce7e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Tue 2006-02-28 19:27:59 +1100
    message:
      First cut at including the knit implementation of versioned_file.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060228074257-a66f0d23e091ce7e
    parent: robertc at robertcollins.net-20060228045234-d1856c4499648fb7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Tue 2006-02-28 18:42:57 +1100
    message:
      Change the return signature of transport.append and append_multi to return the length of the pre-append content.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060228045234-d1856c4499648fb7
    parent: robertc at robertcollins.net-20060222103505-bddb211d353f2543
    parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Tue 2006-02-28 15:52:34 +1100
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060222103505-bddb211d353f2543
    parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-versioned-file-api
    timestamp: Wed 2006-02-22 21:35:05 +1100
    message:
      Merge in a variation of the versionedfile api from versioned-file.



More information about the bazaar-commits mailing list