Rev 2290: Provide new branch6 format in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Feb 15 15:11:33 GMT 2007


------------------------------------------------------------
revno: 2290
revision-id: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
parent: pqm at pqm.ubuntu.com-20070215124016-39cb7bf4759aeede
parent: abentley at panoramicfeedback.com-20070215140823-xaqpzdqb5bmox2ak
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 15:11:31 +0000
message:
  Provide new branch6 format
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
  bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070215140823-xaqpzdqb5bmox2ak
    parent: abentley at panoramicfeedback.com-20070214202801-ur4lw9vhwey5fn2z
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Thu 2007-02-15 09:08:23 -0500
    message:
      Updates from review
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214202801-ur4lw9vhwey5fn2z
    parent: abentley at panoramicfeedback.com-20070214193430-kj7xcd004yn1ju4h
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 15:28:01 -0500
    message:
      Move reverse history iteration to repository
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214193430-kj7xcd004yn1ju4h
    parent: abentley at panoramicfeedback.com-20070214192049-rxv227cpbmti8y1q
    parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 14:34:30 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214192049-rxv227cpbmti8y1q
    parent: abentley at panoramicfeedback.com-20070214182219-w5d2wep3j7rb5h7r
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 14:20:49 -0500
    message:
      Remove metaweave test
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214182219-w5d2wep3j7rb5h7r
    parent: abentley at panoramicfeedback.com-20070214181633-bdp5phbvnwobnr7b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 13:22:19 -0500
    message:
      Store revno for Branch6, set_last_revision -> set_last_revision_info
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214181633-bdp5phbvnwobnr7b
    parent: abentley at panoramicfeedback.com-20070214150906-lqdoxdz1y9zpq4ut
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 13:16:33 -0500
    message:
      Fix broken error
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214150906-lqdoxdz1y9zpq4ut
    parent: abentley at panoramicfeedback.com-20070214145743-m1zbowokgrd9tk30
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 10:09:06 -0500
    message:
      Fix cache updating
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214145743-m1zbowokgrd9tk30
    parent: abentley at panoramicfeedback.com-20070214141157-7xm97jrjf9c9r6xk
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 09:57:43 -0500
    message:
      Update blackbox test to handle new error message
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070214141157-7xm97jrjf9c9r6xk
    parent: abentley at panoramicfeedback.com-20070213223457-1sp639tq2ln141on
    parent: aaron.bentley at utoronto.ca-20070214130143-ducyb0e9jl8xa5l3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-02-14 09:11:57 -0500
    message:
      Merge speedups
        ------------------------------------------------------------
        merged: aaron.bentley at utoronto.ca-20070214130143-ducyb0e9jl8xa5l3
        parent: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: branch6
        timestamp: Wed 2007-02-14 08:01:43 -0500
        message:
          Get log as fast branch5
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070213223457-1sp639tq2ln141on
    parent: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-02-13 17:34:57 -0500
    message:
      tweak config docs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
    parent: abentley at panoramicfeedback.com-20070213222526-ztxquwl9cax22cbf
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-02-13 17:29:10 -0500
    message:
      Change error message (mpool)
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070213222526-ztxquwl9cax22cbf
    parent: abentley at panoramicfeedback.com-20070213214922-gfk43l8ulp9sqvcj
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-02-13 17:25:26 -0500
    message:
      Change asserts to specific errors for left-hand history violations
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070213214922-gfk43l8ulp9sqvcj
    parent: abentley at panoramicfeedback.com-20070213192247-3p6173awqxcd7nae
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-02-13 16:49:22 -0500
    message:
      Update docs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070213192247-3p6173awqxcd7nae
    parent: abentley at panoramicfeedback.com-20070213185839-9cc540a30gtrgq1g
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-02-13 14:22:47 -0500
    message:
      add --append-revisions-only option to init
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070213185839-9cc540a30gtrgq1g
    parent: abentley at panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
    parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-02-13 13:58:39 -0500
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
    parent: abentley at panoramicfeedback.com-20070212192005-2eupzrc1iz5cwc89
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Mon 2007-02-12 18:01:49 -0500
    message:
      Rename strict_revision_history to append_revisions_only
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070212192005-2eupzrc1iz5cwc89
    parent: abentley at panoramicfeedback.com-20070212174148-f7w2am2wcoj71i7c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Mon 2007-02-12 14:20:05 -0500
    message:
      Improve history violation message
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070212174148-f7w2am2wcoj71i7c
    parent: abentley at panoramicfeedback.com-20070212174104-hr82l8n7ttb0ys0a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Mon 2007-02-12 12:41:48 -0500
    message:
      Update docs per Martin's suggestion
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070212174104-hr82l8n7ttb0ys0a
    parent: abentley at panoramicfeedback.com-20070212170925-bvvyl6v6v35lxwja
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Mon 2007-02-12 12:41:04 -0500
    message:
      Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070212170925-bvvyl6v6v35lxwja
    parent: abentley at panoramicfeedback.com-20070212170811-95deo6opqd6usoki
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Mon 2007-02-12 12:09:25 -0500
    message:
      Refactor getting/setting locations with config
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070212170811-95deo6opqd6usoki
    parent: aaron.bentley at utoronto.ca-20070211204718-5leozw99ke6i0fne
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Mon 2007-02-12 12:08:11 -0500
    message:
      Add documentation for synchonize_history
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070211204718-5leozw99ke6i0fne
    parent: aaron.bentley at utoronto.ca-20070211204048-dy6f1rgib2x9yzk9
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Sun 2007-02-11 15:47:18 -0500
    message:
      cleanup
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070211204048-dy6f1rgib2x9yzk9
    parent: aaron.bentley at utoronto.ca-20070211201925-k72id2073qhbor31
    parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Sun 2007-02-11 15:40:48 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070211201925-k72id2073qhbor31
    parent: aaron.bentley at utoronto.ca-20070211192640-d7zioevyig0w2r2u
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Sun 2007-02-11 15:19:25 -0500
    message:
      Implement strict history policy
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070211192640-d7zioevyig0w2r2u
    parent: aaron.bentley at utoronto.ca-20070211174858-809xa5k3qi1aktdv
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Sun 2007-02-11 14:26:40 -0500
    message:
      Implement re-binding previously-bound branches
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070211174858-809xa5k3qi1aktdv
    parent: abentley at panoramicfeedback.com-20070209225951-c4n8dhvdabsag0zq
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Sun 2007-02-11 12:48:58 -0500
    message:
      Fix whitespace issues
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209225951-c4n8dhvdabsag0zq
    parent: abentley at panoramicfeedback.com-20070209211003-5l4u4pdev6bmrzn5
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 17:59:51 -0500
    message:
      Implement conversion to branch 6
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209211003-5l4u4pdev6bmrzn5
    parent: abentley at panoramicfeedback.com-20070209204911-gx2q0xovtexz896t
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 16:10:03 -0500
    message:
      Restore default formats
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209204911-gx2q0xovtexz896t
    parent: abentley at panoramicfeedback.com-20070209203515-ipqlp95njxj6xwwx
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 15:49:11 -0500
    message:
      Skip arbitrary revision-history test for Branch6
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209203515-ipqlp95njxj6xwwx
    parent: abentley at panoramicfeedback.com-20070209203225-9a6m4aoq5v2c7f5l
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 15:35:15 -0500
    message:
      Switch testament tests to knit2
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209203225-9a6m4aoq5v2c7f5l
    parent: abentley at panoramicfeedback.com-20070209202140-gv9pkiad28lqciz7
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 15:32:25 -0500
    message:
      Use knit1 for experimental-branch6 repo
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209202140-gv9pkiad28lqciz7
    parent: abentley at panoramicfeedback.com-20070209200502-c35orp0m00y27foc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 15:21:40 -0500
    message:
      Remove format-on-open code
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209200502-c35orp0m00y27foc
    parent: abentley at panoramicfeedback.com-20070209193838-t4ww0tn3xfo2b0wp
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 15:05:02 -0500
    message:
      Make checkouts imitate parent format
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070209193838-t4ww0tn3xfo2b0wp
    parent: aaron.bentley at utoronto.ca-20070209030224-mv2h60u6xzxbtxrw
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-02-09 14:38:38 -0500
    message:
      Make test suite use format registry default, not BzrDir default
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070209030224-mv2h60u6xzxbtxrw
    parent: aaron.bentley at utoronto.ca-20070209022819-a5god4wdjhxotz91
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Thu 2007-02-08 22:02:24 -0500
    message:
      Set up format on BzrDir construction
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070209022819-a5god4wdjhxotz91
    parent: aaron.bentley at utoronto.ca-20070209013719-s0zwp18cz4718zcw
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Thu 2007-02-08 21:28:19 -0500
    message:
      Add hooking for set_revision_history
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070209013719-s0zwp18cz4718zcw
    parent: aaron.bentley at utoronto.ca-20070209011656-iwhz4egfe3mxggu1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Thu 2007-02-08 20:37:19 -0500
    message:
      Fix testament tests
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070209011656-iwhz4egfe3mxggu1
    parent: aaron.bentley at utoronto.ca-20070209011510-ta7b7x7w6bagd2gk
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Thu 2007-02-08 20:16:56 -0500
    message:
      Handle history sync as a special operation
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070209011510-ta7b7x7w6bagd2gk
    parent: abentley at panoramicfeedback.com-20070208161238-zx0nibynsq71twmo
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Thu 2007-02-08 20:15:10 -0500
    message:
      Set default serializer to 0.9
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070208161238-zx0nibynsq71twmo
    parent: aaron.bentley at utoronto.ca-20070125054738-p4pw3z2eyd3hl0te
    parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Thu 2007-02-08 11:12:38 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070125054738-p4pw3z2eyd3hl0te
    parent: aaron.bentley at utoronto.ca-20070118021644-m0xr38i6zbt0zknn
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Thu 2007-01-25 00:47:38 -0500
    message:
      assertDirectoriesEqual detects missing source, tests handle Branch6
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070118021644-m0xr38i6zbt0zknn
    parent: aaron.bentley at utoronto.ca-20070118015839-3371x5v069dynsex
    parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Wed 2007-01-17 21:16:44 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070118015839-3371x5v069dynsex
    parent: abentley at panoramicfeedback.com-20070117200245-u8oq0ulvmuxbrga5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Wed 2007-01-17 20:58:39 -0500
    message:
      Fix most info tests (but some depend on odd cloning behavior)
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070117200245-u8oq0ulvmuxbrga5
    parent: abentley at panoramicfeedback.com-20070116155845-y4316unaqpfml64y
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Wed 2007-01-17 15:02:45 -0500
    message:
      Clean up trailing whitespace
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070116155845-y4316unaqpfml64y
    parent: abentley at panoramicfeedback.com-20070116151615-da9xjamfwwfpsoo8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-01-16 10:58:45 -0500
    message:
      Fix line endings
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070116151615-da9xjamfwwfpsoo8
    parent: abentley at panoramicfeedback.com-20070116151052-nkdqmfvcqyjy6u8b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-01-16 10:16:15 -0500
    message:
      Genericised test_fetch to handle branch 6 retrieval patterns
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070116151052-nkdqmfvcqyjy6u8b
    parent: abentley at panoramicfeedback.com-20070116142641-eg8mp6nj7wvkq00h
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-01-16 10:10:52 -0500
    message:
      Fix most fetch tests
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070116142641-eg8mp6nj7wvkq00h
    parent: abentley at panoramicfeedback.com-20070116140541-74mmdzqm20losg0n
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-01-16 09:26:41 -0500
    message:
      Abstract mechanism from policy getting/setting parents
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070116140541-74mmdzqm20losg0n
    parent: aaron.bentley at utoronto.ca-20070116131254-sjruli93timappd4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Tue 2007-01-16 09:05:41 -0500
    message:
      Fix binding return values
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070116131254-sjruli93timappd4
    parent: aaron.bentley at utoronto.ca-20070116125940-h86sv9sqcp8pk46d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Tue 2007-01-16 08:12:54 -0500
    message:
      work in progress bind stuff
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070116125940-h86sv9sqcp8pk46d
    parent: aaron.bentley at utoronto.ca-20070113054724-l2aykpvy3k0ug8ok
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Tue 2007-01-16 07:59:40 -0500
    message:
      implement set_last revision and clone
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070113054724-l2aykpvy3k0ug8ok
    parent: abentley at panoramicfeedback.com-20070112213924-t9fm7x7foi5uqa83
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: branch6
    timestamp: Sat 2007-01-13 00:47:24 -0500
    message:
      Follow get_parent API more closely
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070112213924-t9fm7x7foi5uqa83
    parent: abentley at panoramicfeedback.com-20070112194957-pi4z29jxzl6who0c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-01-12 16:39:24 -0500
    message:
      Add more config testing
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070112194957-pi4z29jxzl6who0c
    parent: abentley at panoramicfeedback.com-20070112181841-94zoz6cv72clmsft
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-01-12 14:49:57 -0500
    message:
      Get all branch tests passing
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070112181841-94zoz6cv72clmsft
    parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: branch6
    timestamp: Fri 2007-01-12 13:18:41 -0500
    message:
      Get branch6 creation working



More information about the bazaar-commits mailing list