Rev 2631: Add new bundle and merge-directive formats in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Jul 19 17:09:39 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2631
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
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.134
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.133
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.132
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.131
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.130
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.129
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.128
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.127
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.126
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.125
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.124
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.123
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.122
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.121
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.120
    merged: 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
        ------------------------------------------------------------
        revno: 2520.4.117.1.5
        merged: 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
        ------------------------------------------------------------
        revno: 2520.4.117.1.4
        merged: 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
        ------------------------------------------------------------
        revno: 2520.4.117.1.3
        merged: 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
        ------------------------------------------------------------
        revno: 2520.4.117.1.2
        merged: 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
        ------------------------------------------------------------
        revno: 2520.4.117.1.1
        merged: 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
    ------------------------------------------------------------
    revno: 2520.4.119
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.118
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.117
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.116
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.115
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.114
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.113
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.112
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.111
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.110
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.109
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.108
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.107
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.106
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.105
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.104
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.103
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.102
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.101
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.100
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.99
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.98
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.97
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.96
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.95
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.94
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.93
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.92
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.91
    merged: 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.
    ------------------------------------------------------------
    revno: 2520.4.90
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.89
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.88
    merged: 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)
    ------------------------------------------------------------
    revno: 2520.4.87
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.86
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.85
    merged: 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!)
    ------------------------------------------------------------
    revno: 2520.4.84
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.83
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.82
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.81
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.80
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.79
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.78
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.77
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.76
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.75
    merged: 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.
    ------------------------------------------------------------
    revno: 2520.4.74
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.73
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.72
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.71
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.70
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.69
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.68
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.67
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.66
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.65
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.64
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.63
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.62
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.61
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.60
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.59
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.58
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.57
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.56
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.55
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.54
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.53
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.52
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.51
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.50
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.49
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.48
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.47
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.46
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.45
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.44
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.43
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.42
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.41
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.40
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.39
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.38
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.37
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.36
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.35
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.34
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.33
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.32
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.31
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.30
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.29
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.28
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.27
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.26
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.25
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.24
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.23
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.22
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.21
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.20
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.19
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.18
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.17
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.16
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.15
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.14
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.13
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.12
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.11
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.10
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.9
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.8
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.7
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.6
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.5
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.4
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.3
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.2
    merged: 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
    ------------------------------------------------------------
    revno: 2520.4.1
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.37
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.36
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.35
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.34
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.33
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.32
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.31
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.30
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.29
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.28
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.27
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.26
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.25
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.24
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.23
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.22
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.21
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.20
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.19
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.18
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.17
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.16
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.15
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.14
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.13
    merged: 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
        ------------------------------------------------------------
        revno: 0.7.6.1.1
        merged: 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
    ------------------------------------------------------------
    revno: 0.7.12
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.11
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.10
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.9
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.8
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.7
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.6
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.5
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.4
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.3
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.2
    merged: 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
    ------------------------------------------------------------
    revno: 0.7.1
    merged: 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

Diff too large for email (5597 lines, the limit is 1000).



More information about the bazaar-commits mailing list