Rev 2005: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/
Robert Collins
robertc at robertcollins.net
Fri Oct 6 01:31:01 BST 2006
------------------------------------------------------------
revno: 2005
revision-id: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
parent: robertc at robertcollins.net-20061005075224-6b7bb42ecd661206
parent: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-06 10:31:00 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
merged: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
parent: robertc at robertcollins.net-20061004061912-239c7d82976ddd40
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Fri 2006-10-06 10:28:22 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 05:18:29 +0100
message:
Fix diff3 merges to not indicate conflicts on clean merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061005040512-b15fbaff91fa0aa6
parent: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2006-10-05 00:05:12 -0400
message:
Update test case style
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061004184024-ab0d954c41b40a27
parent: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-04 14:40:24 -0400
message:
Fix diff3 conflict-reporting bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061004131543-5405446f684dafc9
parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-10-04 09:15:43 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061005001436-917ac78b08565d62
parent: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
parent: john at arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-05 01:14:36 +0100
message:
(John Meinel) don't require a valid email for LockDir
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
parent: john at arbash-meinel.com-20060929201258-c491e7ca6daefbb4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lockdir-no-email
timestamp: Fri 2006-09-29 15:24:37 -0500
message:
Switch extract_email_address() to use a more specific exception
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929201258-c491e7ca6daefbb4
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lockdir-no-email
timestamp: Fri 2006-09-29 15:12:58 -0500
message:
Make LockDir less sensitive to invalid configuration of email
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061004081307-413acd85912dbab0
parent: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: mbp at sourcefrog.net-20061004075723-29dc1e1d623942dc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 09:13:07 +0100
message:
(mbp) let bzr+ssh:// work without paramiko
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061004075723-29dc1e1d623942dc
parent: mbp at sourcefrog.net-20061004064308-7e642680b07c5107
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 17:57:23 +1000
message:
Fix missing import
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061004064308-7e642680b07c5107
parent: mbp at sourcefrog.net-20061004064154-97091afbcba2e096
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 16:43:08 +1000
message:
merge bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061004064154-97091afbcba2e096
parent: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Wed 2006-10-04 16:41:54 +1000
message:
Define SmartSSHTransport class even without paramiko
(#62727)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061004050807-10e3417a77ab9943
parent: pqm at pqm.ubuntu.com-20061004034115-7728b1aad33e6433
parent: robertc at robertcollins.net-20061004045023-2915ef0a832dea24
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-04 06:08:07 +0100
message:
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,...
More information about the bazaar-commits
mailing list