Rev 2673: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Fri Jul 20 03:03:33 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2673
revision-id: robertc at robertcollins.net-20070720020310-iau1ln41dagstloo
parent: robertc at robertcollins.net-20070719074510-6atx30q1x6s75l1e
parent: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-07-20 12:03:10 +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/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
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/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
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_xml.py test_xml.py-20050905091053-80b45588931a9b35
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
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.10
revision-id: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
parent: pqm at pqm.ubuntu.com-20070719224856-pv0v2n7tmgpypfmf
parent: robertc at robertcollins.net-20070720005841-xnu6um6vx0n41h0k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 02:53:47 +0100
message:
(robertc) Add FileNames a managed collection of names to get file-discovery without transport listing.
added:
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2592.1.33
revision-id: robertc at robertcollins.net-20070720005841-xnu6um6vx0n41h0k
parent: robertc at robertcollins.net-20070720005743-1s083l5cvp9823nj
parent: pqm at pqm.ubuntu.com-20070719224856-pv0v2n7tmgpypfmf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Fri 2007-07-20 10:58:41 +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/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
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/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-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
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/option.py option.py-20051014052914-661fb36e76e7362f
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_errors.py test_errors.py-20060210110251-41aba2deddf936a8
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_options.py testoptions.py-20051014093702-96457cfc86319a8f
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_source.py test_source.py-20051207061333-a58dea6abecc030d
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/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
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/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
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
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.32
revision-id: robertc at robertcollins.net-20070720005743-1s083l5cvp9823nj
parent: robertc at robertcollins.net-20070719064046-3mbyfeb6ioaw4htk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Fri 2007-07-20 10:57:43 +1000
message:
Tweak docstrings after over-aggressive search n replace.
modified:
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.9
revision-id: pqm at pqm.ubuntu.com-20070719224856-pv0v2n7tmgpypfmf
parent: pqm at pqm.ubuntu.com-20070719202307-rr3ky8d16z5v7h3e
parent: abentley at panoramicfeedback.com-20070719194243-y0x195iuvhzofujf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 23:48:56 +0100
message:
Disable timing-sensitive test
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.7.1.1
revision-id: abentley at panoramicfeedback.com-20070719194243-y0x195iuvhzofujf
parent: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: timing-fix
timestamp: Thu 2007-07-19 15:42:43 -0400
message:
Disable timing-sensitive test
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.8
revision-id: pqm at pqm.ubuntu.com-20070719202307-rr3ky8d16z5v7h3e
parent: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
parent: abentley at panoramicfeedback.com-20070719181611-etp4itjrl2tci9kl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 21:23:07 +0100
message:
Fix format strings
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.136
revision-id: abentley at panoramicfeedback.com-20070719181611-etp4itjrl2tci9kl
parent: abentley at panoramicfeedback.com-20070719150323-o7nd8emdqg44hj66
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 14:16:11 -0400
message:
Fix format strings
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.7
revision-id: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
parent: pqm at pqm.ubuntu.com-20070719081031-069ugi2mfg8accj1
parent: abentley at panoramicfeedback.com-20070719150323-o7nd8emdqg44hj66
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 17:09:34 +0100
message:
Add new bundle and merge-directive formats
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/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
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/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_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_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
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
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.135
revision-id: abentley at panoramicfeedback.com-20070719150323-o7nd8emdqg44hj66
parent: abentley at panoramicfeedback.com-20070719131306-slidf7rax5xqiao8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 11:03:23 -0400
message:
Fix option grammar
modified:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 2520.4.134
revision-id: abentley at panoramicfeedback.com-20070719131306-slidf7rax5xqiao8
parent: abentley at panoramicfeedback.com-20070719125158-0nmu7r2asga2iswq
parent: pqm at pqm.ubuntu.com-20070719081031-069ugi2mfg8accj1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 09:13:06 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
------------------------------------------------------------
revno: 2520.4.133
revision-id: abentley at panoramicfeedback.com-20070719125158-0nmu7r2asga2iswq
parent: abentley at panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 08:51:58 -0400
message:
update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2520.4.132
revision-id: abentley at panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
parent: aaron.bentley at utoronto.ca-20070705001717-xvjziyhsvaehxz01
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-17 09:27:14 -0400
message:
Merge from bzr.dev
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
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:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
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/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
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/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2520.4.131
revision-id: aaron.bentley at utoronto.ca-20070705001717-xvjziyhsvaehxz01
parent: aaron.bentley at utoronto.ca-20070705001520-svwjlw61uiuuwjhk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 20:17:17 -0400
message:
Raise BadBundle for records with wrong number of names
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.130
revision-id: aaron.bentley at utoronto.ca-20070705001520-svwjlw61uiuuwjhk
parent: aaron.bentley at utoronto.ca-20070704233826-jkp63376wi1n96mm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 20:15:20 -0400
message:
Finish tweaking decode_name
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.129
revision-id: aaron.bentley at utoronto.ca-20070704233826-jkp63376wi1n96mm
parent: aaron.bentley at utoronto.ca-20070704230126-gnzpm21043uxugxz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 19:38:26 -0400
message:
update docs
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
------------------------------------------------------------
revno: 2520.4.128
revision-id: aaron.bentley at utoronto.ca-20070704230126-gnzpm21043uxugxz
parent: aaron.bentley at utoronto.ca-20070704224926-ic3z6noh9jaojw3l
parent: pqm at pqm.ubuntu.com-20070704204059-a1x9jomep52m9arn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 19:01:26 -0400
message:
Merge bzr.dev
added:
bzrlib/transport/brokenrename.py brokenrename.py-20070628050843-mbwebk50srn93rut-1
doc/developers/status.txt status.txt-20070702023117-6xss29lx170qndwr-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2520.4.127
revision-id: aaron.bentley at utoronto.ca-20070704224926-ic3z6noh9jaojw3l
parent: aaron.bentley at utoronto.ca-20070704041136-g6rsq0ouz11jrcri
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 18:49:26 -0400
message:
Fix up name encoding to handle revision-ids with slashes
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.126
revision-id: aaron.bentley at utoronto.ca-20070704041136-g6rsq0ouz11jrcri
parent: aaron.bentley at utoronto.ca-20070704035807-xjnc9nztgfdbonqp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 00:11:36 -0400
message:
Add more docs
modified:
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.125
revision-id: aaron.bentley at utoronto.ca-20070704035807-xjnc9nztgfdbonqp
parent: aaron.bentley at utoronto.ca-20070704033828-h1r2ppit8hrjvvtt
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 23:58:07 -0400
message:
Hide multi-parent testing commands
modified:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 2520.4.124
revision-id: aaron.bentley at utoronto.ca-20070704033828-h1r2ppit8hrjvvtt
parent: aaron.bentley at utoronto.ca-20070704030846-jazbwllok1798atc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 23:38:28 -0400
message:
Add docs to multiparent.py
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 2520.4.123
revision-id: aaron.bentley at utoronto.ca-20070704030846-jazbwllok1798atc
parent: aaron.bentley at utoronto.ca-20070704011821-g7a8znh40gfvg2og
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 23:08:46 -0400
message:
Cleanup of bundle code
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.122
revision-id: aaron.bentley at utoronto.ca-20070704011821-g7a8znh40gfvg2og
parent: aaron.bentley at utoronto.ca-20070704011547-alpnh0elj7k2xcdf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 21:18:21 -0400
message:
Clarify doc
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2520.4.121
revision-id: aaron.bentley at utoronto.ca-20070704011547-alpnh0elj7k2xcdf
parent: aaron.bentley at utoronto.ca-20070703235745-gj0v09eqi9k8lrur
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 21:15:47 -0400
message:
Polish up submit command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.120
revision-id: aaron.bentley at utoronto.ca-20070703235745-gj0v09eqi9k8lrur
parent: aaron.bentley at utoronto.ca-20070703060831-ynvii1iu87nvcogi
parent: abentley at panoramicfeedback.com-20070703224803-ycu1f6gw2534a2rx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 19:57:45 -0400
message:
Merge initial support for 'submit' command
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.117.1.5
revision-id: abentley at panoramicfeedback.com-20070703224803-ycu1f6gw2534a2rx
parent: abentley at panoramicfeedback.com-20070703224419-f0t5tyj6zhlubyfh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 18:48:03 -0400
message:
Fix merge-from-branch
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2520.4.117.1.4
revision-id: abentley at panoramicfeedback.com-20070703224419-f0t5tyj6zhlubyfh
parent: abentley at panoramicfeedback.com-20070703205424-4y4w6dbzv04uulo1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 18:44:19 -0400
message:
Replace 'bundle-revisions' with 'submit' command
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.117.1.3
revision-id: abentley at panoramicfeedback.com-20070703205424-4y4w6dbzv04uulo1
parent: abentley at panoramicfeedback.com-20070703193017-r7g35am8j6omtxeu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 16:54:24 -0400
message:
fix sha1 in bundle format 4
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.117.1.2
revision-id: abentley at panoramicfeedback.com-20070703193017-r7g35am8j6omtxeu
parent: abentley at panoramicfeedback.com-20070629182057-c39r2mc22atnjlzs
parent: aaron.bentley at utoronto.ca-20070630045554-o9v9bdmr8o4m8ms2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 15:30:17 -0400
message:
Merge doc updates
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.117.1.1
revision-id: abentley at panoramicfeedback.com-20070629182057-c39r2mc22atnjlzs
parent: aaron.bentley at utoronto.ca-20070629010823-pmkbnl4yyakzd3ts
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-29 14:20:57 -0400
message:
Test installing revisions with subtrees
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.119
revision-id: aaron.bentley at utoronto.ca-20070703060831-ynvii1iu87nvcogi
parent: aaron.bentley at utoronto.ca-20070630045554-o9v9bdmr8o4m8ms2
parent: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 02:08:31 -0400
message:
Merged bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
------------------------------------------------------------
revno: 2520.4.118
revision-id: aaron.bentley at utoronto.ca-20070630045554-o9v9bdmr8o4m8ms2
parent: aaron.bentley at utoronto.ca-20070629010823-pmkbnl4yyakzd3ts
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-30 00:55:54 -0400
message:
Add docs
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.117
revision-id: aaron.bentley at utoronto.ca-20070629010823-pmkbnl4yyakzd3ts
parent: aaron.bentley at utoronto.ca-20070629010536-k59ru9zdawg8aypy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 21:08:23 -0400
message:
Update for new pack interface
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.116
revision-id: aaron.bentley at utoronto.ca-20070629010536-k59ru9zdawg8aypy
parent: aaron.bentley at utoronto.ca-20070629005052-hw2am9r8yv5jq9ys
parent: abentley at panoramicfeedback.com-20070628171306-scpsxn9g89cchzz8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 21:05:36 -0400
message:
Merge container format updates
modified:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
------------------------------------------------------------
revno: 2520.4.115
revision-id: aaron.bentley at utoronto.ca-20070629005052-hw2am9r8yv5jq9ys
parent: abentley at panoramicfeedback.com-20070628204834-2gmckvnzhlpe067x
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 20:50:52 -0400
message:
Merge bzr.dev
added:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2520.4.114
revision-id: abentley at panoramicfeedback.com-20070628204834-2gmckvnzhlpe067x
parent: abentley at panoramicfeedback.com-20070628204130-96m1onr66tdxovgt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 16:48:34 -0400
message:
Avoid deprecated method get_parent_names method
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.113
revision-id: abentley at panoramicfeedback.com-20070628204130-96m1onr66tdxovgt
parent: abentley at panoramicfeedback.com-20070628154506-v0f2y8979irc3dal
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 16:41:30 -0400
message:
Avoid peeking at Repository._serializer
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2520.4.112
revision-id: abentley at panoramicfeedback.com-20070628154506-v0f2y8979irc3dal
parent: abentley at panoramicfeedback.com-20070628151201-0vaz9er4maknt1tv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 11:45:06 -0400
message:
Make cherry-pick merge directives possible
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
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/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.111
revision-id: abentley at panoramicfeedback.com-20070628151201-0vaz9er4maknt1tv
parent: abentley at panoramicfeedback.com-20070628144749-sifruimxo2qfwnbw
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 11:12:01 -0400
message:
Ensure that damaged preview patches produce a warning in merge
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 2520.4.110
revision-id: abentley at panoramicfeedback.com-20070628144749-sifruimxo2qfwnbw
parent: abentley at panoramicfeedback.com-20070628141416-lf6u1noi6gk5lf1g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 10:47:49 -0400
message:
Implement cherrypick support for merge directives
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 2520.4.109
revision-id: abentley at panoramicfeedback.com-20070628141416-lf6u1noi6gk5lf1g
parent: aaron.bentley at utoronto.ca-20070628043159-nwi7dnmpvd6jn3ie
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 10:14:16 -0400
message:
start work on directive cherry-picking
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.108
revision-id: aaron.bentley at utoronto.ca-20070628043159-nwi7dnmpvd6jn3ie
parent: aaron.bentley at utoronto.ca-20070628022537-40re9wj8x04ehl61
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 00:31:59 -0400
message:
Start work on using merge base from directives
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.107
revision-id: aaron.bentley at utoronto.ca-20070628022537-40re9wj8x04ehl61
parent: abentley at panoramicfeedback.com-20070627161928-qbgntllck8r4jbs0
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 22:25:37 -0400
message:
Merge bzr.dev
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
doc/developers/performance-commit.txt => doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
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/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
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-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
------------------------------------------------------------
revno: 2520.4.106
revision-id: abentley at panoramicfeedback.com-20070627161928-qbgntllck8r4jbs0
parent: abentley at panoramicfeedback.com-20070627161112-t1r8d32qifq7ox07
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 12:19:28 -0400
message:
Clarify what patch verification failure means
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2520.4.105
revision-id: abentley at panoramicfeedback.com-20070627161112-t1r8d32qifq7ox07
parent: abentley at panoramicfeedback.com-20070627151232-5rks71udygelmu1l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 12:11:12 -0400
message:
Implement patch verification
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.104
revision-id: abentley at panoramicfeedback.com-20070627151232-5rks71udygelmu1l
parent: abentley at panoramicfeedback.com-20070626200554-vz12r3umida9qapy
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 11:12:32 -0400
message:
Avoid infinite loop when there is no unique lca
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2520.4.103
revision-id: abentley at panoramicfeedback.com-20070626200554-vz12r3umida9qapy
parent: abentley at panoramicfeedback.com-20070626193318-7fhdw5h9dcucqhvl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 16:05:54 -0400
message:
Add MultiParent.to_lines
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.102
revision-id: abentley at panoramicfeedback.com-20070626193318-7fhdw5h9dcucqhvl
parent: abentley at panoramicfeedback.com-20070626193100-d6lhaut5mixlzw5r
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 15:33:18 -0400
message:
rename parents to metadata
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.101
revision-id: abentley at panoramicfeedback.com-20070626193100-d6lhaut5mixlzw5r
parent: abentley at panoramicfeedback.com-20070626185036-q2twi2igv3y94mic
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 15:31:00 -0400
message:
Use a registry to look up xml serializers by format
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 2520.4.100
revision-id: abentley at panoramicfeedback.com-20070626185036-q2twi2igv3y94mic
parent: abentley at panoramicfeedback.com-20070626183935-jxfsq72rkej7ptoz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 14:50:36 -0400
message:
Fix repeat signature installs
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.99
revision-id: abentley at panoramicfeedback.com-20070626183935-jxfsq72rkej7ptoz
parent: abentley at panoramicfeedback.com-20070626160921-xgpi52q1kqnn6dvt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 14:39:35 -0400
message:
Test conversion across models
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.98
revision-id: abentley at panoramicfeedback.com-20070626160921-xgpi52q1kqnn6dvt
parent: abentley at panoramicfeedback.com-20070626153446-t6z9ctbc9f4z1bhm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 12:09:21 -0400
message:
Support inventory conversion with parents
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.97
revision-id: abentley at panoramicfeedback.com-20070626153446-t6z9ctbc9f4z1bhm
parent: abentley at panoramicfeedback.com-20070626142422-ghhb4i1e8d6naad9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 11:34:46 -0400
message:
Hack in support for inventory conversion
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 2520.4.96
revision-id: abentley at panoramicfeedback.com-20070626142422-ghhb4i1e8d6naad9
parent: abentley at panoramicfeedback.com-20070626142025-wtuquq11gys566xz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 10:24:22 -0400
message:
Remove unused base64 stuff
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.95
revision-id: abentley at panoramicfeedback.com-20070626142025-wtuquq11gys566xz
parent: abentley at panoramicfeedback.com-20070625210943-s62ybm0tg32sjirk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 10:20:25 -0400
message:
Add support for header/info records
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.94
revision-id: abentley at panoramicfeedback.com-20070625210943-s62ybm0tg32sjirk
parent: abentley at panoramicfeedback.com-20070625202538-j0k4t5akruv04e79
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 17:09:43 -0400
message:
Update bundle doc
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.93
revision-id: abentley at panoramicfeedback.com-20070625202538-j0k4t5akruv04e79
parent: abentley at panoramicfeedback.com-20070625201359-r54k3m8qrkzc58ib
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 16:25:38 -0400
message:
Fix lock handling in merge directives
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
------------------------------------------------------------
revno: 2520.4.92
revision-id: abentley at panoramicfeedback.com-20070625201359-r54k3m8qrkzc58ib
parent: abentley at panoramicfeedback.com-20070625190839-pbx61klsaa3csyfm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 16:13:59 -0400
message:
fix line-splitting in MultiParent.from_texts
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.91
revision-id: abentley at panoramicfeedback.com-20070625190839-pbx61klsaa3csyfm
parent: aaron.bentley at utoronto.ca-20070623132058-9bgdk6m4jxre0c5w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 15:08:39 -0400
message:
Okay, so I meant metaweave. I think.
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.90
revision-id: aaron.bentley at utoronto.ca-20070623132058-9bgdk6m4jxre0c5w
parent: aaron.bentley at utoronto.ca-20070623051425-xtdjn7z8xsaqah0f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-23 09:20:58 -0400
message:
Handle \r terminated lines in Weaves properly
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.89
revision-id: aaron.bentley at utoronto.ca-20070623051425-xtdjn7z8xsaqah0f
parent: abentley at panoramicfeedback.com-20070622230523-ijd56o4ttto505yp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-23 01:14:25 -0400
message:
Add get_sha1s to weaves
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2520.4.88
revision-id: abentley at panoramicfeedback.com-20070622230523-ijd56o4ttto505yp
parent: abentley at panoramicfeedback.com-20070622224228-35q5zzdqr90hgxrm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 19:05:23 -0400
message:
Retrieve all sha1s at once (ftw)
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 2520.4.87
revision-id: abentley at panoramicfeedback.com-20070622224228-35q5zzdqr90hgxrm
parent: abentley at panoramicfeedback.com-20070622221913-mcjioqruw8rhgnd8
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 18:42:28 -0400
message:
Merge from bzr.dev
added:
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 2520.4.86
revision-id: abentley at panoramicfeedback.com-20070622221913-mcjioqruw8rhgnd8
parent: abentley at panoramicfeedback.com-20070622215356-v2gdv5xzy8gzdsju
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 18:19:13 -0400
message:
Improve locking in _BaseMergeDirective.from_object
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
------------------------------------------------------------
revno: 2520.4.85
revision-id: abentley at panoramicfeedback.com-20070622215356-v2gdv5xzy8gzdsju
parent: abentley at panoramicfeedback.com-20070622213027-pj4680m5ht9my3ep
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 17:53:56 -0400
message:
Get all test passing (which just proves there aren't enough tests!)
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
------------------------------------------------------------
revno: 2520.4.84
revision-id: abentley at panoramicfeedback.com-20070622213027-pj4680m5ht9my3ep
parent: abentley at panoramicfeedback.com-20070622210221-1k64tr26h5wb00fn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 17:30:27 -0400
message:
Fix heisenbug record-rewriting test
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.83
revision-id: abentley at panoramicfeedback.com-20070622210221-1k64tr26h5wb00fn
parent: abentley at panoramicfeedback.com-20070622202814-nw8j3845k012kdwo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 17:02:21 -0400
message:
Clean up tests
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.82
revision-id: abentley at panoramicfeedback.com-20070622202814-nw8j3845k012kdwo
parent: abentley at panoramicfeedback.com-20070622201901-4tmrag0r9le6t6a8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 16:28:14 -0400
message:
Fix tests to stop expecting bundles to build trees
modified:
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
------------------------------------------------------------
revno: 2520.4.81
revision-id: abentley at panoramicfeedback.com-20070622201901-4tmrag0r9le6t6a8
parent: abentley at panoramicfeedback.com-20070622200015-r1t6ylsn0sft2s3f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 16:19:01 -0400
message:
Fix blackbox tests
modified:
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
------------------------------------------------------------
revno: 2520.4.80
revision-id: abentley at panoramicfeedback.com-20070622200015-r1t6ylsn0sft2s3f
parent: abentley at panoramicfeedback.com-20070622192615-5v34zjnm6lubmjp0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 16:00:15 -0400
message:
Improve merge directive tests
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.79
revision-id: abentley at panoramicfeedback.com-20070622192615-5v34zjnm6lubmjp0
parent: abentley at panoramicfeedback.com-20070622190140-rr1d906p3rhi98r2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 15:26:15 -0400
message:
Fixed up not-really-relevant munging tests
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.78
revision-id: abentley at panoramicfeedback.com-20070622190140-rr1d906p3rhi98r2
parent: abentley at panoramicfeedback.com-20070622184643-hh3f73087w00cg1l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 15:01:40 -0400
message:
Remove testament support from bundles
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.77
revision-id: abentley at panoramicfeedback.com-20070622184643-hh3f73087w00cg1l
parent: aaron.bentley at utoronto.ca-20070622055232-3f3b0jxdj76i6vjj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 14:46:43 -0400
message:
Describe bundles and merge directives
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.76
revision-id: aaron.bentley at utoronto.ca-20070622055232-3f3b0jxdj76i6vjj
parent: aaron.bentley at utoronto.ca-20070622050411-sbv1lf3fw5237ssk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 01:52:32 -0400
message:
Move base64-encoding into merge directives
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.75
revision-id: aaron.bentley at utoronto.ca-20070622050411-sbv1lf3fw5237ssk
parent: aaron.bentley at utoronto.ca-20070622033706-m337tg8pvvawkcob
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 01:04:11 -0400
message:
Fix traceback on empty bundles.
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.74
revision-id: aaron.bentley at utoronto.ca-20070622033706-m337tg8pvvawkcob
parent: abentley at panoramicfeedback.com-20070621234317-5w3h8h36oe90sups
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 23:37:06 -0400
message:
bzr info handles patchless bundles
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.73
revision-id: abentley at panoramicfeedback.com-20070621234317-5w3h8h36oe90sups
parent: abentley at panoramicfeedback.com-20070621191028-9yy1ye6jneejm1ht
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 19:43:17 -0400
message:
Implement new merge directive format
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.72
revision-id: abentley at panoramicfeedback.com-20070621191028-9yy1ye6jneejm1ht
parent: abentley at panoramicfeedback.com-20070621184628-61j7hyz3jz1vgcv1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 15:10:28 -0400
message:
Rename format to 4alpha
renamed:
bzrlib/bundle/serializer/v10.py => bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.71
revision-id: abentley at panoramicfeedback.com-20070621184628-61j7hyz3jz1vgcv1
parent: abentley at panoramicfeedback.com-20070621181032-xrljru7ao3fqhvxk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 14:46:28 -0400
message:
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.70
revision-id: abentley at panoramicfeedback.com-20070621181032-xrljru7ao3fqhvxk
parent: abentley at panoramicfeedback.com-20070621175519-t3tqcojb0ygs00ke
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 14:10:32 -0400
message:
Yank patch-handling functionality
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.69
revision-id: abentley at panoramicfeedback.com-20070621175519-t3tqcojb0ygs00ke
parent: abentley at panoramicfeedback.com-20070621173615-5i1oph19t8fnqmsf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 13:55:19 -0400
message:
Simplify encoding by storing bodies in anonymous records
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.68
revision-id: abentley at panoramicfeedback.com-20070621173615-5i1oph19t8fnqmsf
parent: abentley at panoramicfeedback.com-20070621173418-tq9167bvowrklqg7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 13:36:15 -0400
message:
Change name separators to all-slash
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.67
revision-id: abentley at panoramicfeedback.com-20070621173418-tq9167bvowrklqg7
parent: abentley at panoramicfeedback.com-20070621154232-6rwrbujopqn3ydrf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 13:34:18 -0400
message:
Update docs slightly
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.66
revision-id: abentley at panoramicfeedback.com-20070621154232-6rwrbujopqn3ydrf
parent: aaron.bentley at utoronto.ca-20070621120651-0v95pcvjfuzqodbz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 11:42:32 -0400
message:
Update bundle description
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.65
revision-id: aaron.bentley at utoronto.ca-20070621120651-0v95pcvjfuzqodbz
parent: aaron.bentley at utoronto.ca-20070621054638-hfmf2cposlhp2ddh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 08:06:51 -0400
message:
bundle-format4.txt
added:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.64
revision-id: aaron.bentley at utoronto.ca-20070621054638-hfmf2cposlhp2ddh
parent: aaron.bentley at utoronto.ca-20070621053527-rhs3b3u0ozpbr86v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 01:46:38 -0400
message:
Avoid topo sort for v10 bundles
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.63
revision-id: aaron.bentley at utoronto.ca-20070621053527-rhs3b3u0ozpbr86v
parent: abentley at panoramicfeedback.com-20070620220622-9lasxr96rr0e0xvn
parent: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 01:35:27 -0400
message:
Merge bzr.dev
added:
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
------------------------------------------------------------
revno: 2520.4.62
revision-id: abentley at panoramicfeedback.com-20070620220622-9lasxr96rr0e0xvn
parent: abentley at panoramicfeedback.com-20070620172453-egg9dborzgsiir4v
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 18:06:22 -0400
message:
Use a fresh versionedfile each time
modified:
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.61
revision-id: abentley at panoramicfeedback.com-20070620172453-egg9dborzgsiir4v
parent: abentley at panoramicfeedback.com-20070620160813-2zt1l1cjypfo9ut6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 13:24:53 -0400
message:
Do bulk insertion of records
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.60
revision-id: abentley at panoramicfeedback.com-20070620160813-2zt1l1cjypfo9ut6
parent: abentley at panoramicfeedback.com-20070620154956-972lypn4ksoldass
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 12:08:13 -0400
message:
Add sha1 verification for mpdiffs
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.59
revision-id: abentley at panoramicfeedback.com-20070620154956-972lypn4ksoldass
parent: abentley at panoramicfeedback.com-20070620151957-dnstw073l1stty30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 11:49:56 -0400
message:
Push metadata down the stack
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.58
revision-id: abentley at panoramicfeedback.com-20070620151957-dnstw073l1stty30
parent: abentley at panoramicfeedback.com-20070620140207-2pzquz4m0870jg49
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 11:19:57 -0400
message:
Propogate support for metadata to iter_revisions, add storage kind
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.57
revision-id: abentley at panoramicfeedback.com-20070620140207-2pzquz4m0870jg49
parent: aaron.bentley at utoronto.ca-20070620120021-cbroj10ks0grvz62
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 10:02:07 -0400
message:
Remove long-obsolete code
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
------------------------------------------------------------
revno: 2520.4.56
revision-id: aaron.bentley at utoronto.ca-20070620120021-cbroj10ks0grvz62
parent: aaron.bentley at utoronto.ca-20070620050102-pftx49qxti3goosa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 08:00:21 -0400
message:
Begin adding support for arbitrary metadata
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.55
revision-id: aaron.bentley at utoronto.ca-20070620050102-pftx49qxti3goosa
parent: aaron.bentley at utoronto.ca-20070620023938-dsrywb9k05tschj7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 01:01:02 -0400
message:
Fix file revision selection to grab all dependencies properly
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.54
revision-id: aaron.bentley at utoronto.ca-20070620023938-dsrywb9k05tschj7
parent: aaron.bentley at utoronto.ca-20070620002511-6mylajxf4mipn7g7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 22:39:38 -0400
message:
Hang a create_bundle method off repository
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2520.4.53
revision-id: aaron.bentley at utoronto.ca-20070620002511-6mylajxf4mipn7g7
parent: aaron.bentley at utoronto.ca-20070619224859-a3alhu7s6n9huqq6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 20:25:11 -0400
message:
refactor bundle serialization to make write_bundle primary
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.52
revision-id: aaron.bentley at utoronto.ca-20070619224859-a3alhu7s6n9huqq6
parent: abentley at panoramicfeedback.com-20070619182030-pzrju21edb4n2y57
parent: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 18:48:59 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2520.4.51
revision-id: abentley at panoramicfeedback.com-20070619182030-pzrju21edb4n2y57
parent: abentley at panoramicfeedback.com-20070619180757-ybwzcla7683tl0p2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 14:20:30 -0400
message:
Split iteration through file revisions into a method, so we can vary it
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.50
revision-id: abentley at panoramicfeedback.com-20070619180757-ybwzcla7683tl0p2
parent: abentley at panoramicfeedback.com-20070619151416-lwcpo5pna7tqvale
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 14:07:57 -0400
message:
Split write functionality out into a separate object
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.49
revision-id: abentley at panoramicfeedback.com-20070619151416-lwcpo5pna7tqvale
parent: abentley at panoramicfeedback.com-20070619131705-tkigpvx0xhpefs9t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 11:14:16 -0400
message:
Fix lock handling in bundle command
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.48
revision-id: abentley at panoramicfeedback.com-20070619131705-tkigpvx0xhpefs9t
parent: aaron.bentley at utoronto.ca-20070619125517-wzlu137pmbqvik3g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 09:17:05 -0400
message:
Support getting blocks from knit deltas with no final EOL
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.47
revision-id: aaron.bentley at utoronto.ca-20070619125517-wzlu137pmbqvik3g
parent: abentley at panoramicfeedback.com-20070618222132-thva2ds64sss64ih
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 08:55:17 -0400
message:
Fix get_line_delta_blocks with eol
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 2520.4.46
revision-id: abentley at panoramicfeedback.com-20070618222132-thva2ds64sss64ih
parent: aaron.bentley at utoronto.ca-20070618022048-mk9jqqce7c8pez40
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-18 18:21:32 -0400
message:
Merge from bzr.dev
added:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
renamed:
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
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/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
------------------------------------------------------------
revno: 2520.4.45
revision-id: aaron.bentley at utoronto.ca-20070618022048-mk9jqqce7c8pez40
parent: aaron.bentley at utoronto.ca-20070617201643-mzxwm5a21x6i74t4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 22:20:48 -0400
message:
Handle inconsistencies in last-modified-revision between vf and inventory
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.44
revision-id: aaron.bentley at utoronto.ca-20070617201643-mzxwm5a21x6i74t4
parent: aaron.bentley at utoronto.ca-20070617201612-h8ol5ze6p8fa4hce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 16:16:43 -0400
message:
Fix encoding handling in bundle-info
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.43
revision-id: aaron.bentley at utoronto.ca-20070617201612-h8ol5ze6p8fa4hce
parent: aaron.bentley at utoronto.ca-20070617151129-l2hbncksoslro84y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 16:16:12 -0400
message:
Fix test suite
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.42
revision-id: aaron.bentley at utoronto.ca-20070617151129-l2hbncksoslro84y
parent: aaron.bentley at utoronto.ca-20070616132838-3epgsvjr4tealar8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 11:11:29 -0400
message:
Don't assume every revision has a branch nick
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.41
revision-id: aaron.bentley at utoronto.ca-20070616132838-3epgsvjr4tealar8
parent: abentley at panoramicfeedback.com-20070615210534-j35nt792gbg9lyhu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-16 09:28:38 -0400
message:
Accelerate mpdiff generation
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.40
revision-id: abentley at panoramicfeedback.com-20070615210534-j35nt792gbg9lyhu
parent: abentley at panoramicfeedback.com-20070615195417-1myh54o1ebmhyujg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 17:05:34 -0400
message:
Add human-readable diff to bundles
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.39
revision-id: abentley at panoramicfeedback.com-20070615195417-1myh54o1ebmhyujg
parent: abentley at panoramicfeedback.com-20070615185854-ztsenrglm6z0gcg7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 15:54:17 -0400
message:
Rename container => bundle(reader) where appropriate
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.38
revision-id: abentley at panoramicfeedback.com-20070615185854-ztsenrglm6z0gcg7
parent: abentley at panoramicfeedback.com-20070615185506-kftrlbthsitt7yd6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 14:58:54 -0400
message:
Update to latest API
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.37
revision-id: abentley at panoramicfeedback.com-20070615185506-kftrlbthsitt7yd6
parent: abentley at panoramicfeedback.com-20070615153257-bwlxiv2xm13taagh
parent: andrew.bennetts at canonical.com-20070614132802-bas89f67tqq4p3s6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 14:55:06 -0400
message:
Merge container changes
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
------------------------------------------------------------
revno: 2520.4.36
revision-id: abentley at panoramicfeedback.com-20070615153257-bwlxiv2xm13taagh
parent: abentley at panoramicfeedback.com-20070615141804-kqturh52i2e2aa1l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 11:32:57 -0400
message:
Speed up bundle reading, tweak help for bundle-info
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.35
revision-id: abentley at panoramicfeedback.com-20070615141804-kqturh52i2e2aa1l
parent: aaron.bentley at utoronto.ca-20070615112717-zchc59doyk2sfmqt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 10:18:04 -0400
message:
zap obsolete changeset commands, add bundle-info command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.34
revision-id: aaron.bentley at utoronto.ca-20070615112717-zchc59doyk2sfmqt
parent: aaron.bentley at utoronto.ca-20070615032719-4vgjf12ww670lwnu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 07:27:17 -0400
message:
Add signature support
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.33
revision-id: aaron.bentley at utoronto.ca-20070615032719-4vgjf12ww670lwnu
parent: aaron.bentley at utoronto.ca-20070615024753-mjfwbl93x6lrvtrq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 23:27:19 -0400
message:
remove test dependencies on serialization minutia
modified:
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.32
revision-id: aaron.bentley at utoronto.ca-20070615024753-mjfwbl93x6lrvtrq
parent: aaron.bentley at utoronto.ca-20070615023406-p8knvrxt2qswcp6a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 22:47:53 -0400
message:
Fix test case
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.31
revision-id: aaron.bentley at utoronto.ca-20070615023406-p8knvrxt2qswcp6a
parent: aaron.bentley at utoronto.ca-20070615023115-cdu04pyub8dnnl7a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 22:34:06 -0400
message:
Using StringIO for splitting patch lines
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 2520.4.30
revision-id: aaron.bentley at utoronto.ca-20070615023115-cdu04pyub8dnnl7a
parent: abentley at panoramicfeedback.com-20070614232459-hpa3sbawd71o7u3d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 22:31:15 -0400
message:
Do our own line splitting for mp-diffs
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.29
revision-id: abentley at panoramicfeedback.com-20070614232459-hpa3sbawd71o7u3d
parent: abentley at panoramicfeedback.com-20070614210648-hh2vb3t7agdof6i1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 19:24:59 -0400
message:
Reactivate some testing, fix topo_iter
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.28
revision-id: abentley at panoramicfeedback.com-20070614210648-hh2vb3t7agdof6i1
parent: abentley at panoramicfeedback.com-20070614201417-kqyis466gje6y242
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 17:06:48 -0400
message:
Force revisions to be topologically sorted
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 2520.4.27
revision-id: abentley at panoramicfeedback.com-20070614201417-kqyis466gje6y242
parent: abentley at panoramicfeedback.com-20070614190359-p259cpzx114svwbg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 16:14:17 -0400
message:
Use less memory when writing bzip-encoded files
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.26
revision-id: abentley at panoramicfeedback.com-20070614190359-p259cpzx114svwbg
parent: abentley at panoramicfeedback.com-20070614151450-0339tqg0dtvytomf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 15:03:59 -0400
message:
Make decompression reasonably memory-efficient
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.25
revision-id: abentley at panoramicfeedback.com-20070614151450-0339tqg0dtvytomf
parent: abentley at panoramicfeedback.com-20070614150544-kdefum9f4qod1muz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 11:14:50 -0400
message:
Rename ContainerWriter/ContainerReader to BundleWriter/BundleReader
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.24
revision-id: abentley at panoramicfeedback.com-20070614150544-kdefum9f4qod1muz
parent: abentley at panoramicfeedback.com-20070614150408-aqxkmk4ql3qayla5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 11:05:44 -0400
message:
Move heading writing above container beginning
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.23
revision-id: abentley at panoramicfeedback.com-20070614150408-aqxkmk4ql3qayla5
parent: abentley at panoramicfeedback.com-20070614145051-a9a02aeg21t7p5yo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 11:04:08 -0400
message:
Move responsability for encoding into container objects
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.22
revision-id: abentley at panoramicfeedback.com-20070614145051-a9a02aeg21t7p5yo
parent: abentley at panoramicfeedback.com-20070614134034-62f8djek7v6io72w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 10:50:51 -0400
message:
Create ContainerReader
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.21
revision-id: abentley at panoramicfeedback.com-20070614134034-62f8djek7v6io72w
parent: aaron.bentley at utoronto.ca-20070614124412-1wryyqy1uxhn2j0g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 09:40:34 -0400
message:
Finish turning ContainerWriter into a new layer
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.20
revision-id: aaron.bentley at utoronto.ca-20070614124412-1wryyqy1uxhn2j0g
parent: abentley at panoramicfeedback.com-20070613141901-h24lvby5f0klif1d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 08:44:12 -0400
message:
Compress and base64-encode bundle contents
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.19
revision-id: abentley at panoramicfeedback.com-20070613141901-h24lvby5f0klif1d
parent: abentley at panoramicfeedback.com-20070613135555-bd7v11neg1yj41tg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 10:19:01 -0400
message:
Rename format to 1.0alpha
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.18
revision-id: abentley at panoramicfeedback.com-20070613135555-bd7v11neg1yj41tg
parent: aaron.bentley at utoronto.ca-20070613063655-s2mdwt0ybdmnlo0w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 09:55:55 -0400
message:
Generate mpdiffs for inventory
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.17
revision-id: aaron.bentley at utoronto.ca-20070613063655-s2mdwt0ybdmnlo0w
parent: aaron.bentley at utoronto.ca-20070613043730-lll1fxxy3mfne2dl
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 02:36:55 -0400
message:
Merge bzr.dev
added:
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 2520.4.16
revision-id: aaron.bentley at utoronto.ca-20070613043730-lll1fxxy3mfne2dl
parent: aaron.bentley at utoronto.ca-20070613035407-6tijerg0tti5wocg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 00:37:30 -0400
message:
Handle empty versions correctly
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.15
revision-id: aaron.bentley at utoronto.ca-20070613035407-6tijerg0tti5wocg
parent: aaron.bentley at utoronto.ca-20070613035223-wwbwduh6mcueo7o0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-12 23:54:07 -0400
message:
Fix _get_bundle invocations
modified:
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
------------------------------------------------------------
revno: 2520.4.14
revision-id: aaron.bentley at utoronto.ca-20070613035223-wwbwduh6mcueo7o0
parent: aaron.bentley at utoronto.ca-20070612021514-ut2t1haosv5o5103
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-12 23:52:23 -0400
message:
Get most tests passing, use format header
modified:
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/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.13
revision-id: aaron.bentley at utoronto.ca-20070612021514-ut2t1haosv5o5103
parent: aaron.bentley at utoronto.ca-20070612021411-pa2ju7b1loqkq6gm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 22:15:14 -0400
message:
Use real container implementation
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.12
revision-id: aaron.bentley at utoronto.ca-20070612021411-pa2ju7b1loqkq6gm
parent: abentley at panoramicfeedback.com-20070611231420-lp2csdswjqmjp0kq
parent: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 22:14:11 -0400
message:
Merge real container implementation
added:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 2520.4.11
revision-id: abentley at panoramicfeedback.com-20070611231420-lp2csdswjqmjp0kq
parent: abentley at panoramicfeedback.com-20070611230326-dtd5enylxnr1m05z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 19:14:20 -0400
message:
Default to V10
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
------------------------------------------------------------
revno: 2520.4.10
revision-id: abentley at panoramicfeedback.com-20070611230326-dtd5enylxnr1m05z
parent: abentley at panoramicfeedback.com-20070611220925-xjhfisk17770cwud
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 19:03:26 -0400
message:
Enable installation of revisions
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.9
revision-id: abentley at panoramicfeedback.com-20070611220925-xjhfisk17770cwud
parent: abentley at panoramicfeedback.com-20070611165531-7t13giwn5srpnemf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 18:09:25 -0400
message:
Test inventory_vf parents
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.8
revision-id: abentley at panoramicfeedback.com-20070611165531-7t13giwn5srpnemf
parent: abentley at panoramicfeedback.com-20070611151011-mlcggb0oguqssdhu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 12:55:31 -0400
message:
Serialize inventory
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.7
revision-id: abentley at panoramicfeedback.com-20070611151011-mlcggb0oguqssdhu
parent: abentley at panoramicfeedback.com-20070611145952-cwt4480gphdhen6l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 11:10:11 -0400
message:
Fix patch deserialization
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.6
revision-id: abentley at panoramicfeedback.com-20070611145952-cwt4480gphdhen6l
parent: aaron.bentley at utoronto.ca-20070611121043-c79wtxxt15v8iy1c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 10:59:52 -0400
message:
Get installation started
modified:
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.5
revision-id: aaron.bentley at utoronto.ca-20070611121043-c79wtxxt15v8iy1c
parent: aaron.bentley at utoronto.ca-20070611062822-72j7ky4jszv1p45t
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 08:10:43 -0400
message:
Start work on reading mpbundles
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.4
revision-id: aaron.bentley at utoronto.ca-20070611062822-72j7ky4jszv1p45t
parent: aaron.bentley at utoronto.ca-20070611051153-rn2cxa7sn8xxh2j5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 02:28:22 -0400
message:
Get basis support for a new bundle format in place
added:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.3
revision-id: aaron.bentley at utoronto.ca-20070611051153-rn2cxa7sn8xxh2j5
parent: aaron.bentley at utoronto.ca-20070611023508-5pr3felqiyaq18iy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 01:11:53 -0400
message:
Implement plain strategy for extracting and installing multiparent diffs
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.2
revision-id: aaron.bentley at utoronto.ca-20070611023508-5pr3felqiyaq18iy
parent: aaron.bentley at utoronto.ca-20070611021058-7mqy4fsayv27zper
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-10 22:35:08 -0400
message:
Integrate mpdiff into bazaar
removed:
mpdiff mpdiff-20070410170043-8yfvd9yb6bq457db-1
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
renamed:
__init__.py => bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py => bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py => bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.1
revision-id: aaron.bentley at utoronto.ca-20070611021058-7mqy4fsayv27zper
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: aaron.bentley at utoronto.ca-20070517163555-3i7jamitmffdg85l
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-10 22:10:58 -0400
message:
Merge from multiparent
added:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
mpdiff mpdiff-20070410170043-8yfvd9yb6bq457db-1
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.37
revision-id: aaron.bentley at utoronto.ca-20070517163555-3i7jamitmffdg85l
parent: aaron.bentley at utoronto.ca-20070414072354-8g2awkl9xgkdkx3h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-05-17 17:35:55 +0100
message:
Add docstring
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.36
revision-id: aaron.bentley at utoronto.ca-20070414072354-8g2awkl9xgkdkx3h
parent: abentley at panoramicfeedback.com-20070414055201-hmz83pf1w4whsi79
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Sat 2007-04-14 03:23:54 -0400
message:
merge changes
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.35
revision-id: abentley at panoramicfeedback.com-20070414055201-hmz83pf1w4whsi79
parent: abentley at panoramicfeedback.com-20070413203416-7jeoifz1gq41ashn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Sat 2007-04-14 01:52:01 -0400
message:
Add build ranking
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.34
revision-id: abentley at panoramicfeedback.com-20070413203416-7jeoifz1gq41ashn
parent: abentley at panoramicfeedback.com-20070413172354-hejzo2abnnfkga8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 16:34:16 -0400
message:
Implement save, load, snapshot-by-size
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.33
revision-id: abentley at panoramicfeedback.com-20070413172354-hejzo2abnnfkga8b
parent: abentley at panoramicfeedback.com-20070413161641-uch3j6ur8lc5l989
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 13:23:54 -0400
message:
Enable caching commandline param
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.32
revision-id: abentley at panoramicfeedback.com-20070413161641-uch3j6ur8lc5l989
parent: abentley at panoramicfeedback.com-20070413160903-dretiv0cjsv72hnk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 12:16:41 -0400
message:
Allow specifying --outfile and --memory
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.31
revision-id: abentley at panoramicfeedback.com-20070413160903-dretiv0cjsv72hnk
parent: abentley at panoramicfeedback.com-20070413155626-8hpzareuti247zmu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 12:09:03 -0400
message:
Allow selecting MemoryVersionedFile from commandline
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.30
revision-id: abentley at panoramicfeedback.com-20070413155626-8hpzareuti247zmu
parent: aaron.bentley at utoronto.ca-20070413114405-ldopk3ihc7g2gz22
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 11:56:26 -0400
message:
Split into MultiVersionedFile and MultiMemoryVersionedFile
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.29
revision-id: aaron.bentley at utoronto.ca-20070413114405-ldopk3ihc7g2gz22
parent: aaron.bentley at utoronto.ca-20070413032610-0kl5e35fb1h41wax
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Fri 2007-04-13 07:44:05 -0400
message:
Support using disk for knit reconstruction
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.28
revision-id: aaron.bentley at utoronto.ca-20070413032610-0kl5e35fb1h41wax
parent: aaron.bentley at utoronto.ca-20070413024204-2dx1m0kegx252jsx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 23:26:10 -0400
message:
Update snapshot-picking to use sets of ancestors
modified:
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.27
revision-id: aaron.bentley at utoronto.ca-20070413024204-2dx1m0kegx252jsx
parent: aaron.bentley at utoronto.ca-20070413015040-9p1zv3nxm036g3mi
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 22:42:04 -0400
message:
Fix version writing
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.26
revision-id: aaron.bentley at utoronto.ca-20070413015040-9p1zv3nxm036g3mi
parent: abentley at panoramicfeedback.com-20070412205657-s2zabk4ukaexp9bu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 21:50:40 -0400
message:
Move topological iteration into an iterator
modified:
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.25
revision-id: abentley at panoramicfeedback.com-20070412205657-s2zabk4ukaexp9bu
parent: aaron.bentley at utoronto.ca-20070412122029-bnprn1pweeegnph3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Thu 2007-04-12 16:56:57 -0400
message:
More messy hacking
removed:
multiparent/ multiparent-20070410165554-oish6zivsm56jz0n-1
renamed:
multiparent/__init__.py => multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.24
revision-id: aaron.bentley at utoronto.ca-20070412122029-bnprn1pweeegnph3
parent: aaron.bentley at utoronto.ca-20070412052122-fcqoswo0oearlj8a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 08:20:29 -0400
message:
Add some snapshot-selection crack
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.23
revision-id: aaron.bentley at utoronto.ca-20070412052122-fcqoswo0oearlj8a
parent: aaron.bentley at utoronto.ca-20070412043921-nl2n5ez9pl4m8vxj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 01:21:22 -0400
message:
handle snapshots all at once
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.22
revision-id: aaron.bentley at utoronto.ca-20070412043921-nl2n5ez9pl4m8vxj
parent: aaron.bentley at utoronto.ca-20070412023811-x7enxbfo9hy71t4t
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 00:39:21 -0400
message:
Fix restoration bug
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.21
revision-id: aaron.bentley at utoronto.ca-20070412023811-x7enxbfo9hy71t4t
parent: aaron.bentley at utoronto.ca-20070412012353-nd4p9jnnchr3gxjo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Wed 2007-04-11 22:38:11 -0400
message:
finish converting ft_ to snapshots
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.20
revision-id: aaron.bentley at utoronto.ca-20070412012353-nd4p9jnnchr3gxjo
parent: abentley at panoramicfeedback.com-20070411220315-k35yco5t4prdi6n0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Wed 2007-04-11 21:23:53 -0400
message:
Convert to a plugin
removed:
.bzrignore bzrignore-20070410234508-prpi2q917yj7ns24-1
multiparent/tests/ tests-20070410133617-n1jdhcc1n1mibarp-3
renamed:
mpregen => __init__.py* mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/tests/test_multiparent.py => test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
__init__.py* mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.19
revision-id: abentley at panoramicfeedback.com-20070411220315-k35yco5t4prdi6n0
parent: abentley at panoramicfeedback.com-20070411203957-j7uadxym4214p6ly
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 18:03:15 -0400
message:
More tweakage
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.18
revision-id: abentley at panoramicfeedback.com-20070411203957-j7uadxym4214p6ly
parent: abentley at panoramicfeedback.com-20070411200340-81f58wipd7jpeoe7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 16:39:57 -0400
message:
Implement from_patch
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.17
revision-id: abentley at panoramicfeedback.com-20070411200340-81f58wipd7jpeoe7
parent: abentley at panoramicfeedback.com-20070411175052-uvfmwfyaqg7muqf2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 16:03:40 -0400
message:
Dynamically select snapshots based on all parents
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.16
revision-id: abentley at panoramicfeedback.com-20070411175052-uvfmwfyaqg7muqf2
parent: abentley at panoramicfeedback.com-20070411141030-iu8981q6qgm91wg6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 13:50:52 -0400
message:
More control over snapshotting, disable caching for inventory
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.15
revision-id: abentley at panoramicfeedback.com-20070411141030-iu8981q6qgm91wg6
parent: abentley at panoramicfeedback.com-20070411140941-4ch4vyw3gerb7dmm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 10:10:30 -0400
message:
Make mpregen output a psuedo-knit
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.14
revision-id: abentley at panoramicfeedback.com-20070411140941-4ch4vyw3gerb7dmm
parent: abentley at panoramicfeedback.com-20070411125025-swu1vxorxv15l7vs
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 10:09:41 -0400
message:
Temporarily force snapshots to 44
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.13
revision-id: abentley at panoramicfeedback.com-20070411125025-swu1vxorxv15l7vs
parent: aaron.bentley at utoronto.ca-20070411063909-t630ktlwrss64yyk
parent: abentley at panoramicfeedback.com-20070410185805-n4swrf30u7ivajgg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: temp
timestamp: Wed 2007-04-11 08:50:25 -0400
message:
Merge
modified:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.6.1.1
revision-id: abentley at panoramicfeedback.com-20070410185805-n4swrf30u7ivajgg
parent: abentley at panoramicfeedback.com-20070410173827-hvguwu1iaxxk3olo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 14:58:05 -0400
message:
Tree locking's always a good idea
modified:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.12
revision-id: aaron.bentley at utoronto.ca-20070411063909-t630ktlwrss64yyk
parent: aaron.bentley at utoronto.ca-20070411041839-33qitnr1gkc0essj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Wed 2007-04-11 02:39:09 -0400
message:
Make benchmarks for mp
added:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.11
revision-id: aaron.bentley at utoronto.ca-20070411041839-33qitnr1gkc0essj
parent: aaron.bentley at utoronto.ca-20070411034552-r3o32h9akqd7wrll
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Wed 2007-04-11 00:18:39 -0400
message:
Implement reconstruct_version, handle all hunks through that
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.10
revision-id: aaron.bentley at utoronto.ca-20070411034552-r3o32h9akqd7wrll
parent: aaron.bentley at utoronto.ca-20070411030235-q8ngiatm1np64piq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 23:45:52 -0400
message:
Text reconstruction seems to work
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.9
revision-id: aaron.bentley at utoronto.ca-20070411030235-q8ngiatm1np64piq
parent: aaron.bentley at utoronto.ca-20070411001609-fbx52la1yi0o3ui9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 23:02:35 -0400
message:
Much progress on non-naive text reconstruction
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.8
revision-id: aaron.bentley at utoronto.ca-20070411001609-fbx52la1yi0o3ui9
parent: aaron.bentley at utoronto.ca-20070410234515-reyhqm22o5lcj2i0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 20:16:09 -0400
message:
get add_version working
renamed:
tests => multiparent/tests tests-20070410133617-n1jdhcc1n1mibarp-3
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.7
revision-id: aaron.bentley at utoronto.ca-20070410234515-reyhqm22o5lcj2i0
parent: abentley at panoramicfeedback.com-20070410173827-hvguwu1iaxxk3olo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 19:45:15 -0400
message:
Support dirstate in mpknit
added:
.bzrignore bzrignore-20070410234508-prpi2q917yj7ns24-1
modified:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.6
revision-id: abentley at panoramicfeedback.com-20070410173827-hvguwu1iaxxk3olo
parent: abentley at panoramicfeedback.com-20070410170759-d6x4p4f8991rhzbl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 13:38:27 -0400
message:
Add mpknit command
added:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.5
revision-id: abentley at panoramicfeedback.com-20070410170759-d6x4p4f8991rhzbl
parent: abentley at panoramicfeedback.com-20070410165451-2iurz267ur027vjr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 13:07:59 -0400
message:
Add mpdiff command for diffing multiple files to the commandline
added:
mpdiff mpdiff-20070410170043-8yfvd9yb6bq457db-1
multiparent/ multiparent-20070410165554-oish6zivsm56jz0n-1
renamed:
__init__.py => multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.4
revision-id: abentley at panoramicfeedback.com-20070410165451-2iurz267ur027vjr
parent: abentley at panoramicfeedback.com-20070410163232-y2w6ke39sxb305yv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 12:54:51 -0400
message:
Start supporting serialization
modified:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.3
revision-id: abentley at panoramicfeedback.com-20070410163232-y2w6ke39sxb305yv
parent: abentley at panoramicfeedback.com-20070410162405-sczvbxmrwek7l2g5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 12:32:32 -0400
message:
Get three-parent comparisions under test
modified:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.2
revision-id: abentley at panoramicfeedback.com-20070410162405-sczvbxmrwek7l2g5
parent: abentley at panoramicfeedback.com-20070410141425-86yh4m1cb6wwnwwm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 12:24:05 -0400
message:
Get single-parent comparison working
modified:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.1
revision-id: abentley at panoramicfeedback.com-20070410141425-86yh4m1cb6wwnwwm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 10:14:25 -0400
message:
Get trivial case passing
added:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/ tests-20070410133617-n1jdhcc1n1mibarp-3
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2592.1.25.2.7.1.6
revision-id: pqm at pqm.ubuntu.com-20070719081031-069ugi2mfg8accj1
parent: pqm at pqm.ubuntu.com-20070719071637-0rm8kj6vaswb9zty
parent: ian.clatworthy at internode.on.net-20070719073723-24e82ct97qno1ub5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 09:10:31 +0100
message:
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.5.1.1
revision-id: ian.clatworthy at internode.on.net-20070719073723-24e82ct97qno1ub5
parent: pqm at pqm.ubuntu.com-20070719071637-0rm8kj6vaswb9zty
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-07-19 17:37:23 +1000
message:
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.5
revision-id: pqm at pqm.ubuntu.com-20070719071637-0rm8kj6vaswb9zty
parent: pqm at pqm.ubuntu.com-20070719062212-492i9t2j91oiwjxy
parent: ian.clatworthy at internode.on.net-20070719064237-h19qnfyrfmwubvez
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 08:16:37 +0100
message:
(Ian Clatworthy) make plugins command public with better help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.4.1.1
revision-id: ian.clatworthy at internode.on.net-20070719064237-h19qnfyrfmwubvez
parent: pqm at pqm.ubuntu.com-20070719062212-492i9t2j91oiwjxy
parent: ian.clatworthy at internode.on.net-20070713084553-7is76iha0tj6o4lo
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-07-19 16:42:37 +1000
message:
(Ian Clatworthy) make plugins command public with better help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.5.1
revision-id: ian.clatworthy at internode.on.net-20070713084553-7is76iha0tj6o4lo
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.plugins-public
timestamp: Fri 2007-07-13 18:45:53 +1000
message:
Make the plugins command public with better help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.4
revision-id: pqm at pqm.ubuntu.com-20070719062212-492i9t2j91oiwjxy
parent: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
parent: ian.clatworthy at internode.on.net-20070719034054-5yccb10yeari6b7u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 07:22:12 +0100
message:
Merge Kent's work for left alignment of log output for merge only revisions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 2592.1.25.2.7.1.3.1.1
revision-id: ian.clatworthy at internode.on.net-20070719034054-5yccb10yeari6b7u
parent: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
parent: kent at ispirenetworks.com-20070707032028-abmivg21e6bdva3c
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-07-19 13:40:54 +1000
message:
Merge Kent's work for left alignment of log output for merge only revisions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 2466.8.1.3.3
revision-id: kent at ispirenetworks.com-20070707032028-abmivg21e6bdva3c
parent: warthog618 at gmail.com-20070507095504-h218h9pfkcftmaqt
committer: Kent Gibson <kent at ispirenetworks.com>
branch nick: log_range
timestamp: Sat 2007-07-07 11:20:28 +0800
message:
Fix JAM's review comments for left align patch
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 2466.8.1.3.2
revision-id: warthog618 at gmail.com-20070507095504-h218h9pfkcftmaqt
parent: warthog618 at gmail.com-20070504104926-dmz6x2gw7ydb8i7p
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: log_range
timestamp: Mon 2007-05-07 17:55:04 +0800
message:
shift log output with only merge revisions to the left margin
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
Diff too large for email (5842 lines, the limit is 1000).
More information about the bazaar-commits
mailing list