Rev 2674: Merge write-group. in http://people.ubuntu.com/~robertc/baz2.0/repository

Robert Collins robertc at robertcollins.net
Fri Jul 20 03:38:27 BST 2007


At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2674
revision-id: robertc at robertcollins.net-20070720023823-tg8l88wqqrl54pl2
parent: robertc at robertcollins.net-20070720020310-iau1ln41dagstloo
parent: robertc at robertcollins.net-20070720022713-z6x6cns4dy1mzhpk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-07-20 12:38:23 +1000
message:
  Merge write-group.
    ------------------------------------------------------------
    revno: 2592.1.25.1.5
    revision-id: robertc at robertcollins.net-20070720022713-z6x6cns4dy1mzhpk
    parent: robertc at robertcollins.net-20070719002827-t1pu9alpneh3k966
    parent: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repo-write-group
    timestamp: Fri 2007-07-20 12:27:13 +1000
    message:
      Merge bzr.dev.
    removed:
      bzrlib/bundle/common.py        common.py-20050619223838-f25048f6638f04c6
      bzrlib/bundle/old/             old-20051119041827-8f2417a9cc3b67f2
      bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
    added:
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/file_names.py           file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
      bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
      bzrlib/plugins/multiparent.py  mpregen-20070411063203-5x9z7i73add0d6f6-1
      bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
      bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
      bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
      doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
    renamed:
      bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bundle/apply_bundle.py  apply_changeset.py-20050620044656-dba4eb8021a36f95
      bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
      bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
      bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
      bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
      bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
      bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
      bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
      bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
      bzrlib/xml5.py                 xml5.py-20050907032657-aac8f960815b66b1
      bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
      doc/developers/bundles.txt     bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
      tools/capture_tree.py          capture_tree.py-20051004100938-c7ff053182f5ae51
      tools/rst2prettyhtml.py        rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
      tools/trace-revisions          tracerevisions-20051107162041-9dfee0a7324d206d
      bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 2592.1.25.1.4
    revision-id: robertc at robertcollins.net-20070719002827-t1pu9alpneh3k966
    parent: robertc at robertcollins.net-20070718234410-sa56x9ui5la405jf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repo-write-group
    timestamp: Thu 2007-07-19 10:28:27 +1000
    message:
      Update tests with things that break when a repository requires write groups to be used.
    modified:
      bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
    ------------------------------------------------------------
    revno: 2592.1.25.1.3
    revision-id: robertc at robertcollins.net-20070718234410-sa56x9ui5la405jf
    parent: robertc at robertcollins.net-20070717160400-l1ng2wgmldsttebk
    parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: repo-write-group
    timestamp: Thu 2007-07-19 09:44:10 +1000
    message:
      Merge bzr.dev.
    added:
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
      bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
      bzrlib/util/tests/             bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
      bzrlib/util/tests/__init__.py  __init__.py-20070713054446-oliu3oth0gy08y0t-1
      bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
      doc/bug_trackers.txt           bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
      doc/developers/diff.txt        diff.txt-20070716233605-2q6jzorua7mr42jk-1
      doc/developers/indices.txt     indices.txt-20070713142939-m5cdnp31u8ape0td-1
      doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
      bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
      bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
      bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
      doc/README.1st                 README.1st-20060314161707-b943d5d4cce669b6
      doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
      doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
      doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
      doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
      doc/http_smart_server.txt      fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
      doc/plugins.txt                plugins.txt-20060314145616-525099a747f3ffdd
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70



More information about the bazaar-commits mailing list