Rev 1596: (mbp) pycurl fixes, other fixes, weave commands,
verbose commit changes from robert in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Mar 22 12:17:03 GMT 2006
------------------------------------------------------------
revno: 1596
revision-id: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
parent: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
parent: mbp at sourcefrog.net-20060322120537-8ec4c8b33db81378
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 12:17:00 +0000
message:
(mbp) pycurl fixes, other fixes, weave commands, verbose commit changes from robert
added:
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322120537-8ec4c8b33db81378
parent: mbp at sourcefrog.net-20060322114528-5b3d4ba72c80dead
parent: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 12:05:37 +0000
message:
[merge] trunk
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060322114528-5b3d4ba72c80dead
parent: mbp at sourcefrog.net-20060321142754-f0124cd7888ced54
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Wed 2006-03-22 11:45:28 +0000
message:
Set Cache-control: max-age=0 and Pragma: no-cache
for pycurl
(Thanks jamesh)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060321142754-f0124cd7888ced54
parent: mbp at sourcefrog.net-20060321122654-514047ed65795a17
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-03-21 14:27:54 +0000
message:
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060321122654-514047ed65795a17
parent: mbp at sourcefrog.net-20060320230942-152767f76202f543
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Tue 2006-03-21 12:26:54 +0000
message:
New developer commands 'weave-list' and 'weave-join'.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320230942-152767f76202f543
parent: mbp at sourcefrog.net-20060320223241-95ba66352fd77026
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 23:09:42 +0000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320223241-95ba66352fd77026
parent: mbp at sourcefrog.net-20060320200221-4341638c81ea56d3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 22:32:41 +0000
message:
Cleanup and document some check code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320200221-4341638c81ea56d3
parent: mbp at sourcefrog.net-20060320194010-6e16a1ed5ad492f2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 20:02:21 +0000
message:
Verbose commit shouldn't talk about every unchanged file.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320194010-6e16a1ed5ad492f2
parent: mbp at sourcefrog.net-20060320183433-ccd67ac1a77d40e2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 19:40:10 +0000
message:
Clean up cut&pasted test for verbose commit
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320183433-ccd67ac1a77d40e2
parent: mbp at sourcefrog.net-20060320182752-44ffa76314daacb6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 18:34:33 +0000
message:
Emit trace message about hash cache performance.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320182752-44ffa76314daacb6
parent: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
parent: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 18:27:52 +0000
message:
[merge] robertc
Fix timing dependency in hashcache test that would sometimes cause
false failure.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060320073835-61854f8dc05101b0
parent: robertc at robertcollins.net-20060320072604-c769364c9fb2ef0b
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-20 18:38:35 +1100
message:
Latest bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060320072604-c769364c9fb2ef0b
parent: robertc at robertcollins.net-20060317130304-6c5ff2ac3f6f24f7
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-03-20 18:26:04 +1100
message:
Integrate latest bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060317130304-6c5ff2ac3f6f24f7
parent: robertc at robertcollins.net-20060316215951-15c76b4d8ea06ca5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-03-18 00:03:04 +1100
message:
Make reconcile faster on weaves [again].
------------------------------------------------------------
merged: robertc at robertcollins.net-20060316215951-15c76b4d8ea06ca5
parent: robertc at robertcollins.net-20060316205332-f4f08a6852e590f1
parent: pqm at pqm.ubuntu.com-20060315174853-9af1dfc721b7c963
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-17 08:59:51 +1100
message:
Merge bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060316205332-f4f08a6852e590f1
parent: robertc at robertcollins.net-20060315122642-05693b82bcd6c9f5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-17 07:53:32 +1100
message:
Make commit verbose mode work!.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060315122642-05693b82bcd6c9f5
parent: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
parent: pqm at pqm.ubuntu.com-20060313111548-a43e5df3eecad141
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-03-15 23:26:42 +1100
message:
Merge bzr.dev
More information about the bazaar-commits
mailing list