Rev 1462: Update test support,
and remove deprecated functions pullable_revisions and
get_intervening_revisions. in /home/robertc/source/baz/test-pb/
Robert Collins
robertc at robertcollins.net
Tue May 9 04:17:23 BST 2006
------------------------------------------------------------
revno: 1462
revision-id: robertc at robertcollins.net-20060509031713-8539b308cf622a47
parent: robertc at robertcollins.net-20060428110138-0e69ecb765434f9d
parent: robertc at robertcollins.net-20060509015717-952b5d71d0cc2897
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-pb
timestamp: Tue 2006-05-09 13:17:13 +1000
message:
Update test support, and remove deprecated functions pullable_revisions and get_intervening_revisions.
added:
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/repository_implementations/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
renamed:
bzrlib/tests/test_annotate.py => bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
tutorial.txt => doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
merged: robertc at robertcollins.net-20060509015717-952b5d71d0cc2897
parent: robertc at robertcollins.net-20060508015548-6b3445bfeeead5ca
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Tue 2006-05-09 11:57:17 +1000
message:
Get run_bzr in tests to always assign a new, clean ui factory.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060508015548-6b3445bfeeead5ca
parent: robertc at robertcollins.net-20060501232206-38facba683896034
parent: pqm at pqm.ubuntu.com-20060505082929-a037ee137f1ff240
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Mon 2006-05-08 11:55:48 +1000
message:
merge .dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060505082929-a037ee137f1ff240
parent: pqm at pqm.ubuntu.com-20060505082434-afac3df16b6aea15
parent: robertc at robertcollins.net-20060505044335-0e785bae0df1047e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-05-05 09:29:29 +0100
message:
Merge break-lock command.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505044335-0e785bae0df1047e
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
parent: robertc at robertcollins.net-20060505040931-20b87352d3434037
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-05-05 14:43:35 +1000
message:
Merge break-lock command.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505040931-20b87352d3434037
parent: robertc at robertcollins.net-20060505040351-7322a57e9085748b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 14:09:31 +1000
message:
Test break lock on old format branches.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505040351-7322a57e9085748b
parent: robertc at robertcollins.net-20060505040011-da8649051797224e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 14:03:51 +1000
message:
Ensure that answering no to break lock leaves the locks in place. This is currently simple - ask for everything always.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505040011-da8649051797224e
parent: robertc at robertcollins.net-20060505004425-55597abf11998087
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 14:00:11 +1000
message:
Review comments.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060505004425-55597abf11998087
parent: robertc at robertcollins.net-20060504140823-29fc10b61b2db894
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 10:44:25 +1000
message:
Merge HEAD.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504140823-29fc10b61b2db894
parent: robertc at robertcollins.net-20060504135532-f0152b27530fd30c
parent: robertc at robertcollins.net-20060503235739-fbc2d4eed5d5c754
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-05-05 00:08:23 +1000
message:
Merge HEAD.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504135532-f0152b27530fd30c
parent: robertc at robertcollins.net-20060504134651-e6ced8954d74a342
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:55:32 +1000
message:
Hook in the full break-lock ui.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504134651-e6ced8954d74a342
parent: robertc at robertcollins.net-20060504132631-ab199c12d7427f82
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:46:51 +1000
message:
Teach TestCase.run_bzr_captured about the ui factories.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504132631-ab199c12d7427f82
parent: robertc at robertcollins.net-20060504130128-32da543d660b7061
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:26:31 +1000
message:
Branch.break_lock should handle bound branches too
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504130128-32da543d660b7061
parent: robertc at robertcollins.net-20060504115351-79122d06d443d4a8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 23:01:28 +1000
message:
Teach WorkingTree about break-lock.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504115351-79122d06d443d4a8
parent: robertc at robertcollins.net-20060504111736-b61e8e7c87c3aaaa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 21:53:51 +1000
message:
Teach Branch about break_lock.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504111736-b61e8e7c87c3aaaa
parent: robertc at robertcollins.net-20060504103613-bf4d13f925aa8520
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 21:17:36 +1000
message:
Teach Repository about break_lock.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504103613-bf4d13f925aa8520
parent: robertc at robertcollins.net-20060504101340-18fa61cb9cf268fb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 20:36:13 +1000
message:
Extend LockableFiles to support break_lock() calls.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504101340-18fa61cb9cf268fb
parent: robertc at robertcollins.net-20060504083932-009bfa89993005aa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 20:13:40 +1000
message:
Add break_lock utility function to LockDir.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504083932-009bfa89993005aa
parent: robertc at robertcollins.net-20060504061106-dea34f7ad6b4855a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 18:39:32 +1000
message:
Add bzrlib.ui.ui_factory.get_boolean().
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504061106-dea34f7ad6b4855a
parent: robertc at robertcollins.net-20060504013148-74208691b1b4857e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 16:11:06 +1000
message:
Make LockDir.unlock check the lock is still intact.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060504013148-74208691b1b4857e
parent: robertc at robertcollins.net-20060428055433-be86bc92d5efd816
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Thu 2006-05-04 11:31:48 +1000
message:
Add stdin parameter to run_bzr and run_bzr_captured.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060428055433-be86bc92d5efd816
parent: pqm at pqm.ubuntu.com-20060427011433-95634ee1da8a2049
committer: Robert Collins <robertc at robertcollins.net>
branch nick: break-lock
timestamp: Fri 2006-04-28 15:54:33 +1000
message:
Document what the break-lock commands should be like
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060505082434-afac3df16b6aea15
parent: pqm at pqm.ubuntu.com-20060505081949-c953c4dd61f52b81
parent: jblack at merconline.com-20060505010504-264cb48507e53b64
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-05-05 09:24:34 +0100
message:
(jblack,mbp) merge documentation updates
------------------------------------------------------------
merged: jblack at merconline.com-20060505010504-264cb48507e53b64
parent: jblack at merconline.com-20060315172252-6d42e669e7f6a8fe
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.introduce-wiki-docs-into-bzr
timestamp: Thu 2006-05-04 21:05:04 -0400
message:
merged mainline
------------------------------------------------------------
merged: jblack at merconline.com-20060315172252-6d42e669e7f6a8fe
parent: jblack at merconline.com-20060314165735-30bae1b8da652fa4
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.docs
timestamp: Wed 2006-03-15 12:22:52 -0500
message:
merge from mainline
------------------------------------------------------------
merged: jblack at merconline.com-20060314165735-30bae1b8da652fa4
parent: jblack at merconline.com-20060314162252-57b09902e2985779
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-03-14 11:57:35 -0500
message:
Now they look good in rst2html
------------------------------------------------------------
merged: jblack at merconline.com-20060314162252-57b09902e2985779
parent: pqm at pqm.ubuntu.com-20060312001904-3bcd7cbf830cc37c
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-03-14 11:22:52 -0500
message:
Copied in docs for wiki & First round cleanup
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060505081949-c953c4dd61f52b81
parent: pqm at pqm.ubuntu.com-20060505081528-8c0368b718fd7933
parent: mbp at sourcefrog.net-20060505012934-1043f68323f15f88
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-05-05 09:19:49 +0100
message:
(mbp,olaf) lockdir and diff improvements
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060505012934-1043f68323f15f88
parent: mbp at sourcefrog.net-20060505012749-94b6adfce7285eca
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.lockdir
timestamp: Fri 2006-05-05 11:29:34 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060505012749-94b6adfce7285eca
parent: mbp at sourcefrog.net-20060505005541-7ad07e37a4508ea8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.lockdir
timestamp: Fri 2006-05-05 11:27:49 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060505005541-7ad07e37a4508ea8
parent: mbp at sourcefrog.net-20060504060743-cdcb40c14eb62d10
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.lockdir
timestamp: Fri 2006-05-05 10:55:41 +1000
message:
Create lockdir info files using transport.append
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504060743-cdcb40c14eb62d10
parent: mbp at sourcefrog.net-20060504060300-eed0e79351fd6182
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.diff
timestamp: Thu 2006-05-04 16:07:43 +1000
message:
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504060300-eed0e79351fd6182
parent: mbp at sourcefrog.net-20060504050917-dd7516977826b788
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.diff
timestamp: Thu 2006-05-04 16:03:00 +1000
message:
Add -p0, -p1 options for diff.
Change --diff-prefix to just --prefix.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504050917-dd7516977826b788
parent: mbp at sourcefrog.net-20060504050255-d0c0573ef8849c59
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.diff
timestamp: Thu 2006-05-04 15:09:17 +1000
message:
Add test for diff --diff-prefix, which was previously untested.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504050255-d0c0573ef8849c59
parent: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.diff
timestamp: Thu 2006-05-04 15:02:55 +1000
message:
Remove 'a/', 'b/' default prefixes on diff output.
(You can still get them with --diff-prefix)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060505081528-8c0368b718fd7933
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
parent: mbp at sourcefrog.net-20060505073338-d833dcfb87e5c4d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-05-05 09:15:28 +0100
message:
(mbp,alexander) rmtree forces deletion of readonly files on win32
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060505073338-d833dcfb87e5c4d8
parent: mbp at sourcefrog.net-20060505012424-de641b8f253cff99
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-05-05 17:33:38 +1000
message:
Add additional explanation to NEWS
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060505012424-de641b8f253cff99
parent: mbp at sourcefrog.net-20060505011553-76b4687a5e1d01e3
parent: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-05-05 11:24:24 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060505011553-76b4687a5e1d01e3
parent: mbp at sourcefrog.net-20060504065938-0e2871ad0d76f3a2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-05-05 11:15:53 +1000
message:
[patch] force deletion of trees containing readonly files (alexander)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060504081215-e807a459c8bcb379
parent: pqm at pqm.ubuntu.com-20060504062622-8826ecc9fcd7e700
parent: mbp at sourcefrog.net-20060504065938-0e2871ad0d76f3a2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-04 09:12:15 +0100
message:
(mbp,olaf) lock info, metaweave format name, docs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504065938-0e2871ad0d76f3a2
parent: mbp at sourcefrog.net-20060504033443-abe6c9e566087691
parent: pqm at pqm.ubuntu.com-20060504062622-8826ecc9fcd7e700
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 16:59:38 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504033443-abe6c9e566087691
parent: mbp at sourcefrog.net-20060504024031-82abe45d799c9350
parent: olaf at conradi.org-20060503130122-b40b41c13fdbcb75
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 13:34:43 +1000
message:
[merge olaf] Change format name to metaweave
------------------------------------------------------------
merged: olaf at conradi.org-20060503130122-b40b41c13fdbcb75
parent: olaf at conradi.org-20060428192651-37c092ebd9b0cee9
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.metaweave
timestamp: Wed 2006-05-03 15:01:22 +0200
message:
Do mention the older formats inside help for commands 'init', 'init-repo'
and 'upgrade'.
------------------------------------------------------------
merged: olaf at conradi.org-20060428192651-37c092ebd9b0cee9
parent: olaf at conradi.org-20060428134126-f5eaeeecc25e735e
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.metaweave
timestamp: Fri 2006-04-28 21:26:51 +0200
message:
Rename format 'metadir' to 'default'. Only mention format 'knit' in help
for commands 'init' and 'init-repo'. Fix test cases accordingly.
------------------------------------------------------------
merged: olaf at conradi.org-20060428134126-f5eaeeecc25e735e
parent: pqm at pqm.ubuntu.com-20060427055036-db71ba9c9889cbbd
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.metaweave
timestamp: Fri 2006-04-28 15:41:26 +0200
message:
For campatability, make old format for weave repository inside metadir
available as 'metaweave' format.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504024031-82abe45d799c9350
parent: mbp at sourcefrog.net-20060504023547-6ff07ce73c778717
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 12:40:31 +1000
message:
Remove backup warning from bzr help
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060504023547-6ff07ce73c778717
parent: mbp at sourcefrog.net-20060503080505-dd3f40f3ee57b137
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-05-04 12:35:47 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060503080505-dd3f40f3ee57b137
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
parent: olaf at conradi.org-20060501131509-e7c2f9d82251c34b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-05-03 18:05:05 +1000
message:
[merge] bzr info and lock improvements (olaf)
------------------------------------------------------------
merged: olaf at conradi.org-20060501131509-e7c2f9d82251c34b
parent: olaf at conradi.org-20060501123226-16a739a5ffc22999
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 15:15:09 +0200
message:
Querying os locks is not supported, adjusted test case to verify bzr
info does not show the locking section when using a deprecated format.
------------------------------------------------------------
merged: olaf at conradi.org-20060501123226-16a739a5ffc22999
parent: olaf at conradi.org-20060501115811-f45d107ae4772add
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 14:32:26 +0200
message:
Modify related locations section of bzr info to keep closer to the left
side of the screen when only one location for parent or push is set.
------------------------------------------------------------
merged: olaf at conradi.org-20060501115811-f45d107ae4772add
parent: olaf at conradi.org-20060501074321-0d39d1f35b124dc2
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 13:58:11 +0200
message:
Removed _countiter() from info.py. It was never used, not even in the
revision which introduced it.
------------------------------------------------------------
merged: olaf at conradi.org-20060501074321-0d39d1f35b124dc2
parent: olaf at conradi.org-20060501072514-243b86368e363af7
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 09:43:21 +0200
message:
Add NEWS entry, change text of skipped test for os style locks.
------------------------------------------------------------
merged: olaf at conradi.org-20060501072514-243b86368e363af7
parent: olaf at conradi.org-20060430220956-edb2a743c28c3a33
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 09:25:14 +0200
message:
Fix alignment of nested parenthesis.
------------------------------------------------------------
merged: olaf at conradi.org-20060430220956-edb2a743c28c3a33
parent: olaf at conradi.org-20060430204240-80a7db1d50a50e6b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Mon 2006-05-01 00:09:56 +0200
message:
Change test_info_locking_oslocks() for locking the working tree.
------------------------------------------------------------
merged: olaf at conradi.org-20060430204240-80a7db1d50a50e6b
parent: olaf at conradi.org-20060430204147-79d4b73937a803fa
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 22:42:40 +0200
message:
Fixed test case with bzr update inside test_info, it now uses the API.
------------------------------------------------------------
merged: olaf at conradi.org-20060430204147-79d4b73937a803fa
parent: olaf at conradi.org-20060430155515-115cf13f3d7925a6
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 22:41:47 +0200
message:
Fix import line of bzrlib.errors. BzrError was not imported, the other
was inconsistently referenced. LockDir is not needed any more.
------------------------------------------------------------
merged: olaf at conradi.org-20060430155515-115cf13f3d7925a6
parent: olaf at conradi.org-20060429231005-a1523dc3a8feb494
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 17:55:15 +0200
message:
Mark peek() for oslock style locks as NotImplemented. Added one simple
test case for when they are.
------------------------------------------------------------
merged: olaf at conradi.org-20060429231005-a1523dc3a8feb494
parent: olaf at conradi.org-20060429204730-01bbbe1e6e372e61
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sun 2006-04-30 01:10:05 +0200
message:
Rename is_transport_locked() to get_physical_lock_status() as the
transport is abstracted away from. Prefixed with get_ as it might take
some time to return.
------------------------------------------------------------
merged: olaf at conradi.org-20060429204730-01bbbe1e6e372e61
parent: olaf at conradi.org-20060428064355-74d873ac81abd0e3
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sat 2006-04-29 22:47:30 +0200
message:
Implemented locking status for formats using LockDir.
* Add is_transport_locked() to class LockableFiles and make it
available through classes WorkingTree, Branch and Repository.
* Complete the test case for all permutations of locking.
* Re-enabled the read locks inside the info command.
------------------------------------------------------------
merged: olaf at conradi.org-20060428064355-74d873ac81abd0e3
parent: olaf at conradi.org-20060421154716-9bc46986533d72e0
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-28 08:43:55 +0200
message:
Add initial support for showing locking information in bzr info.
* Add outline for test case.
* Add is_locked() to Branch and WorkingTree classes.
* Add new section 'Locked locations' to bzr info.
* Removed read locks from info command, maybe re-add them to those functions
that need them.
------------------------------------------------------------
merged: olaf at conradi.org-20060421154716-9bc46986533d72e0
parent: olaf at conradi.org-20060420131557-780ada3c14298063
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-21 17:47:16 +0200
message:
Simplified construct detection in location overview a lot.
Renamed bound branches to checkouts and added prefix light to lightweight
checkouts.
------------------------------------------------------------
merged: olaf at conradi.org-20060420131557-780ada3c14298063
parent: olaf at conradi.org-20060420092440-554262e77a2a6ab5
parent: pqm at pqm.ubuntu.com-20060420082224-da4345a35c42e545
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-20 13:15:57 +0000
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060420092440-554262e77a2a6ab5
parent: olaf at conradi.org-20060420090043-3ba383f1eca3122a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-20 11:24:40 +0200
message:
Minor update for knit being the new default format.
------------------------------------------------------------
merged: olaf at conradi.org-20060420090043-3ba383f1eca3122a
parent: olaf at conradi.org-20060419192853-3dc5c06815c8b097
parent: pqm at pqm.ubuntu.com-20060420080929-dff63a32df0b3e0b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Thu 2006-04-20 11:00:43 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060419192853-3dc5c06815c8b097
parent: olaf at conradi.org-20060419191753-07e830c241a31f9b
parent: pqm at pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Wed 2006-04-19 21:28:53 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: olaf at conradi.org-20060419191753-07e830c241a31f9b
parent: olaf at conradi.org-20060415024104-6e567ea171f22924
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Wed 2006-04-19 21:17:53 +0200
message:
Show paths relative to shared repository if applicable. This gives a
more compact and easier overview of locations. Moved parent and push
location to a seperate section called related branches.
------------------------------------------------------------
merged: olaf at conradi.org-20060415024104-6e567ea171f22924
parent: olaf at conradi.org-20060414123139-a8479b3e99b56a28
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Sat 2006-04-15 04:41:04 +0200
message:
Add updated help message for bzr info.
------------------------------------------------------------
merged: olaf at conradi.org-20060414123139-a8479b3e99b56a28
parent: olaf at conradi.org-20060414120606-a7f4b6c53b8d402b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 14:31:39 +0200
message:
Test case for bzr info on a non-existing branch.
------------------------------------------------------------
merged: olaf at conradi.org-20060414120606-a7f4b6c53b8d402b
parent: olaf at conradi.org-20060414115912-8eefdc1c709ecad4
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 14:06:06 +0200
message:
Fix comments and a docstring.
------------------------------------------------------------
merged: olaf at conradi.org-20060414115912-8eefdc1c709ecad4
parent: olaf at conradi.org-20060414103626-e4d25342681c17f8
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 13:59:12 +0200
message:
Show shared repository location for bzr info on a repository with a
working tree inside the root.
------------------------------------------------------------
merged: olaf at conradi.org-20060414103626-e4d25342681c17f8
parent: olaf at conradi.org-20060411013408-b42419dc665020f2
parent: pqm at pqm.ubuntu.com-20060414013800-bd0ac9b0d1f8ba7b
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.info
timestamp: Fri 2006-04-14 12:36:26 +0200
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060504062622-8826ecc9fcd7e700
parent: pqm at pqm.ubuntu.com-20060504062159-24dc5151bb9cba69
parent: robertc at robertcollins.net-20060503235739-fbc2d4eed5d5c754
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-04 07:26:22 +0100
message:
Merge in fetch integrity improvement for missing file-text detection.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060503235739-fbc2d4eed5d5c754
parent: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
parent: robertc at robertcollins.net-20060503060322-0315b1b1751a318d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-04 09:57:39 +1000
message:
Merge in fetch integrity improvement for missing file-text detection.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060503060322-0315b1b1751a318d
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fetch
timestamp: Wed 2006-05-03 16:03:22 +1000
message:
Add tests that a repository.fetch from a repository where there is a missing file text raises RevisionNotPresent and does not install the revision object.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060504062159-24dc5151bb9cba69
parent: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
parent: abentley at panoramicfeedback.com-20060503205044-6234433f38c83157
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-04 07:21:59 +0100
message:
Revision parameter for annotate
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503205044-6234433f38c83157
parent: abentley at panoramicfeedback.com-20060503204418-af2a19ca82ff0ea7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:50:44 -0400
message:
Added annotate test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503204418-af2a19ca82ff0ea7
parent: abentley at panoramicfeedback.com-20060503204236-56829ad9b13a5da4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:44:18 -0400
message:
Changed rev_id to revision_id in cmd_annotate
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503204236-56829ad9b13a5da4
parent: abentley at panoramicfeedback.com-20060503203619-7572e90f2a91b644
parent: olaf at conradi.org-20060501210308-69720dff17b3d479
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:42:36 -0400
message:
Merge annotate -r from Olaf
------------------------------------------------------------
merged: olaf at conradi.org-20060501210308-69720dff17b3d479
parent: olaf at conradi.org-20060501205852-a98e0670fcd19265
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.annotate
timestamp: Mon 2006-05-01 23:03:08 +0200
message:
Add NEWS entry.
------------------------------------------------------------
merged: olaf at conradi.org-20060501205852-a98e0670fcd19265
parent: olaf at conradi.org-20060501203106-f3609b90d86cb863
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.annotate
timestamp: Mon 2006-05-01 22:58:52 +0200
message:
Move test case for annotate to blackbox, add tests for revision option.
------------------------------------------------------------
merged: olaf at conradi.org-20060501203106-f3609b90d86cb863
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Olaf Conradi <olaf at conradi.org>
branch nick: bzr.olaf.annotate
timestamp: Mon 2006-05-01 22:31:06 +0200
message:
Add --revision option to bzr annotate command.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060503203619-7572e90f2a91b644
parent: abentley at panoramicfeedback.com-20060417132055-3498a8631cb2fb31
parent: pqm at pqm.ubuntu.com-20060503071159-abd0de926d70d64c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-05-03 16:36:19 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
parent: pqm at pqm.ubuntu.com-20060503071159-abd0de926d70d64c
parent: robertc at robertcollins.net-20060503100143-94b0e2f638dbbb8d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-05-03 23:01:07 +0100
message:
Merge in push-without-working-tree, knit-sftp-speed, reconcile-fixes-revision-graph-cache.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060503100143-94b0e2f638dbbb8d
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
parent: robertc at robertcollins.net-20060501232206-38facba683896034
parent: robertc at robertcollins.net-20060502040743-c3eae60f1b9edf1c
parent: robertc at robertcollins.net-20060503092540-9f4487ad389bc285
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-05-03 20:01:43 +1000
message:
Multiple merges:
* push should work with branches without a working tree.
* Knit pushes on SFTP are now much faster (removed a bad latency multiplier).
* Reconciles at the end of fetch now skip non-dataloss issues. The command line
reconcile will still check all data.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060503092540-9f4487ad389bc285
parent: robertc at robertcollins.net-20060502123240-525d74f55b034ede
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Wed 2006-05-03 19:25:40 +1000
message:
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060502123240-525d74f55b034ede
parent: robertc at robertcollins.net-20060502111207-e4ff704e86662870
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Tue 2006-05-02 22:32:40 +1000
message:
Teach reconcile to check the left-most parent is correct in the revision graph.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060502111207-e4ff704e86662870
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Tue 2006-05-02 21:12:07 +1000
message:
* Repository.reconcile now takes a thorough keyword parameter to allow
requesting an indepth reconciliation, rather than just a data-loss
check. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060502040743-c3eae60f1b9edf1c
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit-join-batching
timestamp: Tue 2006-05-02 14:07:43 +1000
message:
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060503071159-abd0de926d70d64c
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
parent: john at arbash-meinel.com-20060429154015-2ed83b4e1041240e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-05-03 08:11:59 +0100
message:
(jam) Fix msgeditor to find platform editors (Olaf Conradi), added tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060429154015-2ed83b4e1041240e
parent: john at arbash-meinel.com-20060429153026-cc7e756ff8a5bf50
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2006-04-29 10:40:15 -0500
message:
Added a test for the new list of editors.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060429153026-cc7e756ff8a5bf50
parent: john at arbash-meinel.com-20060429152827-28dbfa64632fb13b
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2006-04-29 10:30:26 -0500
message:
[merge] bzr.dev 1692
------------------------------------------------------------
merged: john at arbash-meinel.com-20060429152827-28dbfa64632fb13b
parent: john at arbash-meinel.com-20060429152747-e75257759537019d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2006-04-29 10:28:27 -0500
message:
Fix import order for msgeditor.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060429152747-e75257759537019d
parent: john at arbash-meinel.com-20060426183130-64be4c6854e36a9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2006-04-29 10:27:47 -0500
message:
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix
------------------------------------------------------------
merged: robertc at robertcollins.net-20060501232206-38facba683896034
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Tue 2006-05-02 09:22:06 +1000
message:
Fix push to work with just a branch, no need for a working tree.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
parent: pqm at pqm.ubuntu.com-20060428095922-4c5cfc2812115f2f
parent: john at arbash-meinel.com-20060426183130-64be4c6854e36a9b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-04-29 10:19:50 +0100
message:
Small help-text fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426183130-64be4c6854e36a9b
parent: john at arbash-meinel.com-20060426153749-414995209cbfcefb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-04-26 13:31:30 -0500
message:
grammer fix.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426153749-414995209cbfcefb
parent: john at arbash-meinel.com-20060426152202-83e042c31a4072aa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-04-26 10:37:49 -0500
message:
--basis has been implemented for checkouts.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426152202-83e042c31a4072aa
parent: john at arbash-meinel.com-20060426152024-f035d9d642427fb9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-04-26 10:22:02 -0500
message:
Fixing 'bzr help init' text
------------------------------------------------------------
merged: john at arbash-meinel.com-20060426152024-f035d9d642427fb9
parent: john at arbash-meinel.com-20060221173608-e169d8586d154050
parent: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-04-26 10:20:24 -0500
message:
[merge] bzr.dev 1685
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060428095922-4c5cfc2812115f2f
parent: pqm at pqm.ubuntu.com-20060428094627-39fe69886455ed98
parent: mbp at sourcefrog.net-20060428095243-1f2759a89505837e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-28 10:59:22 +0100
message:
(mbp) commit editor improvements
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060428095243-1f2759a89505837e
parent: mbp at sourcefrog.net-20060428095003-eb70f67db515354d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-28 19:52:43 +1000
message:
Only one blank line in the commit message editor, kthxbye.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060428095003-eb70f67db515354d
parent: mbp at sourcefrog.net-20060428093520-facdfa15d5007057
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-28 19:50:03 +1000
message:
(patch) better detection of the write commit message editor to use (mpe, robertc)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060428094627-39fe69886455ed98
parent: pqm at pqm.ubuntu.com-20060428092440-8062af83acdae3f8
parent: mbp at sourcefrog.net-20060428093520-facdfa15d5007057
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-28 10:46:27 +0100
message:
(mbp) add --diff-prefix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060428093520-facdfa15d5007057
parent: mbp at sourcefrog.net-20060427060651-76ae2e43095fd25e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-04-28 19:35:20 +1000
message:
(patch) --diff-prefix option (goffredo, alexander)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060428092440-8062af83acdae3f8
parent: pqm at pqm.ubuntu.com-20060427055036-db71ba9c9889cbbd
parent: mbp at sourcefrog.net-20060427060651-76ae2e43095fd25e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-04-28 10:24:40 +0100
message:
(mbp) fixes from Alexander for test suite and pycurl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060427060651-76ae2e43095fd25e
parent: mbp at sourcefrog.net-20060427054707-a7540467d76d4794
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-27 16:06:51 +1000
message:
(patch) check that pycurl will actuall initialize as well as load (Alexander)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060427054707-a7540467d76d4794
parent: mbp at sourcefrog.net-20060427052518-07705dc5b3ce02cf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-27 15:47:07 +1000
message:
(patch) better warnings when tests are skipped (Alexander)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060427055036-db71ba9c9889cbbd
parent: pqm at pqm.ubuntu.com-20060427011433-95634ee1da8a2049
parent: mbp at sourcefrog.net-20060427052518-07705dc5b3ce02cf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-27 06:50:36 +0100
message:
(mbp) developer docs on transports, urls and unicode
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060427052518-07705dc5b3ce02cf
parent: mbp at sourcefrog.net-20060424092150-e7b43850d6418c79
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-04-27 15:25:18 +1000
message:
(HACKING) some notes on handling unicode & urls for transports
More information about the bazaar-commits
mailing list