Rev 2266: [merge] bzr.dev 2293 and resolve conflicts, but still broken in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/knit_utf8_revision_ids
John Arbash Meinel
john at arbash-meinel.com
Sat Feb 17 01:43:22 GMT 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/knit_utf8_revision_ids
------------------------------------------------------------
revno: 2266
revision-id: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
parent: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 19:42:57 -0600
message:
[merge] bzr.dev 2293 and resolve conflicts, but still broken
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
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_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 2249.1.44
merged: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
parent: mbp at sourcefrog.net-20070216060614-4xtp9d9nq3146xue
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-16 06:48:35 +0000
message:
(mbp,r=john,r=aaron) use os._exit from bzr script to quit faster and avoid thread kibble
------------------------------------------------------------
revno: 2249.1.39.1.3
merged: mbp at sourcefrog.net-20070216060614-4xtp9d9nq3146xue
parent: mbp at sourcefrog.net-20070215100953-94yv7skrymohnnbi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-02-16 17:06:14 +1100
message:
update copyright
------------------------------------------------------------
revno: 2249.1.39.1.2
merged: mbp at sourcefrog.net-20070215100953-94yv7skrymohnnbi
parent: mbp at sourcefrog.net-20070215061543-yzyvx2fuidks9l7i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-02-15 21:09:53 +1100
message:
not necessary to explicitly flush stderr (spiv)
------------------------------------------------------------
revno: 2249.1.39.1.1
merged: mbp at sourcefrog.net-20070215061543-yzyvx2fuidks9l7i
parent: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-02-15 17:15:43 +1100
message:
os._exit rather than sys.exit at top level
somewhat faster through avoiding shutdown
and avoids bg threads whining about modules going away
------------------------------------------------------------
revno: 2249.1.43
merged: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
parent: pqm at pqm.ubuntu.com-20070215175417-99e71dd9b0b8fef7
parent: john at arbash-meinel.com-20070215180121-ar7e34iaqclvq16o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 18:14:16 +0000
message:
(John Arbash Meinel) make 'bzr remove-tree' a non-hidden command.
------------------------------------------------------------
revno: 2249.1.41.1.1
merged: john at arbash-meinel.com-20070215180121-ar7e34iaqclvq16o
parent: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-02-15 12:01:21 -0600
message:
Promote 'remove-tree' to a public command.
------------------------------------------------------------
revno: 2249.1.42
merged: pqm at pqm.ubuntu.com-20070215175417-99e71dd9b0b8fef7
parent: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
parent: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 17:54:17 +0000
message:
Selftest handles wacky plugin behavior
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.20
merged: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
parent: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-15 11:00:31 -0500
message:
Selftest handles wacky plugin behavior
------------------------------------------------------------
revno: 2249.1.41
merged: 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
------------------------------------------------------------
revno: 2230.3.55
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
------------------------------------------------------------
revno: 2230.3.54
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
------------------------------------------------------------
revno: 2230.3.53
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
------------------------------------------------------------
revno: 2230.3.52
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
------------------------------------------------------------
revno: 2230.3.51
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
------------------------------------------------------------
revno: 2230.3.50
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
------------------------------------------------------------
revno: 2230.3.49
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
------------------------------------------------------------
revno: 2230.3.48
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
------------------------------------------------------------
revno: 2230.3.47
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
------------------------------------------------------------
revno: 2230.3.45.1.1
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
------------------------------------------------------------
revno: 2230.3.46
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
------------------------------------------------------------
revno: 2230.3.45
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)
------------------------------------------------------------
revno: 2230.3.44
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
------------------------------------------------------------
revno: 2230.3.43
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
------------------------------------------------------------
revno: 2230.3.42
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
------------------------------------------------------------
revno: 2230.3.41
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
------------------------------------------------------------
revno: 2230.3.40
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
------------------------------------------------------------
revno: 2230.3.39
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
------------------------------------------------------------
revno: 2230.3.38
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
------------------------------------------------------------
revno: 2230.3.37
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]
------------------------------------------------------------
revno: 2230.3.36
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
------------------------------------------------------------
revno: 2230.3.35
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
------------------------------------------------------------
revno: 2230.3.34
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
------------------------------------------------------------
revno: 2230.3.33
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
------------------------------------------------------------
revno: 2230.3.32
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
------------------------------------------------------------
revno: 2230.3.31
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
------------------------------------------------------------
revno: 2230.3.30
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
------------------------------------------------------------
revno: 2230.3.29
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
------------------------------------------------------------
revno: 2230.3.28
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
------------------------------------------------------------
revno: 2230.3.27
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
------------------------------------------------------------
revno: 2230.3.26
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
------------------------------------------------------------
revno: 2230.3.25
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
------------------------------------------------------------
revno: 2230.3.24
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
------------------------------------------------------------
revno: 2230.3.23
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
------------------------------------------------------------
revno: 2230.3.22
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
------------------------------------------------------------
revno: 2230.3.21
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
------------------------------------------------------------
revno: 2230.3.20
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
------------------------------------------------------------
revno: 2230.3.19
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
------------------------------------------------------------
revno: 2230.3.18
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
------------------------------------------------------------
revno: 2230.3.17
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
------------------------------------------------------------
revno: 2230.3.16
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
------------------------------------------------------------
revno: 2230.3.15
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
------------------------------------------------------------
revno: 2230.3.14
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
------------------------------------------------------------
revno: 2230.3.13
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)
------------------------------------------------------------
revno: 2230.3.12
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
------------------------------------------------------------
revno: 2230.3.11
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
------------------------------------------------------------
revno: 2230.3.10
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
------------------------------------------------------------
revno: 2230.3.9
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
------------------------------------------------------------
revno: 2230.3.8
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
------------------------------------------------------------
revno: 2230.3.7
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
------------------------------------------------------------
revno: 2230.3.6
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
------------------------------------------------------------
revno: 2230.3.5
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
------------------------------------------------------------
revno: 2230.3.4
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
------------------------------------------------------------
revno: 2230.3.3
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
------------------------------------------------------------
revno: 2230.3.2
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
------------------------------------------------------------
revno: 2230.3.1
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
------------------------------------------------------------
revno: 2249.1.40
merged: pqm at pqm.ubuntu.com-20070215124016-39cb7bf4759aeede
parent: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: bialix at ukr.net-20070214110051-4b8bp7bo74aoc83v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 12:40:16 +0000
message:
(bialix) custom reimplementation of abspath in Python for Windows
98 (#84278)
------------------------------------------------------------
revno: 2249.1.30.4.4
merged: bialix at ukr.net-20070214110051-4b8bp7bo74aoc83v
parent: bialix at ukr.net-20070214102753-7ihuxer38uanf3d5
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 13:00:51 +0200
message:
merge bzr.dev; NEWS entry
------------------------------------------------------------
revno: 2249.1.30.4.3
merged: bialix at ukr.net-20070214102753-7ihuxer38uanf3d5
parent: bialix at ukr.net-20070214101112-bhyewz9ye89za73e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:27:53 +0200
message:
win98_abspath: support for running in POSIX environment: cwd path has not drive letter
so we need to be careful about result of _win98_abspath('/path')
------------------------------------------------------------
revno: 2249.1.30.4.2
merged: bialix at ukr.net-20070214101112-bhyewz9ye89za73e
parent: bialix at ukr.net-20070214100900-i4rygckilzdjc1tz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:11:12 +0200
message:
Don't do normpath after abspath, because this function is called inside abspath
------------------------------------------------------------
revno: 2249.1.30.4.1
merged: bialix at ukr.net-20070214100900-i4rygckilzdjc1tz
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:09:00 +0200
message:
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
------------------------------------------------------------
revno: 2249.1.39
merged: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 02:37:51 +0000
message:
Generate iter_changes output from TreeTransform, use in merge, revert, etc.
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.13
merged: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
parent: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:57:40 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.12
merged: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:40:53 -0500
message:
Changes from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.11
merged: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
parent: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 12:09:47 -0500
message:
Get tests passing
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.10
merged: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
parent: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 11:26:22 -0500
message:
Add change reporting to pull
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.9
merged: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
parent: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:56:49 -0500
message:
Apply change reporting to merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.8
merged: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
parent: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:37:10 -0500
message:
Clarify what conflicts may not be present
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.7
merged: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
parent: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:28:12 -0500
message:
Stop modified flag bleeding into later changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.6
merged: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
parent: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:05:23 -0500
message:
Emit change listings before conflict warnings
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.5
merged: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
parent: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:02:23 -0500
message:
cleanup
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.4
merged: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
parent: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 09:10:35 -0500
message:
Sort output of Transform.iter_changes by path
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.3
merged: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
parent: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:42:45 -0500
message:
Use tree transform to emit upcoming change list
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.2
merged: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
parent: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:18:50 -0500
message:
Get kind change detection working for iter_changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.1
merged: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 15:07:37 -0500
message:
Initial work on converting TreeTransform to iter_changes format
------------------------------------------------------------
revno: 2249.1.38
merged: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: john at arbash-meinel.com-20070213223316-dlowmy4as5xhe921
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 00:04:18 +0000
message:
(John Arbash Meinel, r=robert) Avoid an extra inventory deserialization during commit.
------------------------------------------------------------
revno: 2249.1.34.2.1
merged: john at arbash-meinel.com-20070213223316-dlowmy4as5xhe921
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: avoid_extra_deserialization
timestamp: Tue 2007-02-13 16:33:16 -0600
message:
Avoid deserializing an inventory we have already parsed.
------------------------------------------------------------
revno: 2249.1.37
merged: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 09:51:20 +0000
message:
(mbp) add -d option to push, pull, merge (r=aaron)
------------------------------------------------------------
revno: 2249.1.30.3.1
merged: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: dashd
timestamp: Tue 2007-02-13 20:21:08 +1100
message:
Add a -d option to push, pull, merge (ported from tags branch)
------------------------------------------------------------
revno: 2249.1.36
merged: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
parent: mbp at sourcefrog.net-20070214071027-0fh0mtcte2kuc86o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 07:40:46 +0000
message:
(mbp,aaron) Change register_metadir to take fully-qualified repository class name.
------------------------------------------------------------
revno: 2241.1.21
merged: mbp at sourcefrog.net-20070214071027-0fh0mtcte2kuc86o
parent: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-14 18:10:27 +1100
message:
Change register_metadir to take fully-qualified repository class name.
(Review suggestion from Aaron.)
------------------------------------------------------------
revno: 2249.1.35
merged: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
parent: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 18:02:51 +0000
message:
(John Arbash Meinel) (trivial) remove unused and incorrect code.
------------------------------------------------------------
revno: 2249.1.34.1.1
merged: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-02-13 10:12:27 -0600
message:
(John Arbash Meinel) (trivial) remove unused and incorrect code.
-------------- next part --------------
Diff too large for email (3396 lines, the limit is 1000).
More information about the bazaar-commits
mailing list