Rev 1593: Merge from bzr.dev in
/home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Wed Mar 22 13:21:18 GMT 2006
------------------------------------------------------------
revno: 1593
revision-id: robertc at robertcollins.net-20060322132114-cc057ded01411a94
parent: robertc at robertcollins.net-20060321124137-b9028b082c63d99d
parent: pqm at pqm.ubuntu.com-20060322121700-79ce0be81013aba1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-03-23 00:21:14 +1100
message:
Merge from bzr.dev
added:
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
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/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
merged: 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
------------------------------------------------------------
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: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
parent: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
parent: aaron.bentley at utoronto.ca-20060322042217-bdc20e3a63a9c03b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 08:20:09 +0000
message:
Fixed merge-type weave
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060322042217-bdc20e3a63a9c03b
parent: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.weavemerge
timestamp: Tue 2006-03-21 23:22:17 -0500
message:
Fixed merge-type weave
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
parent: abentley at panoramicfeedback.com-20060321144742-81f3405d3ede7519
parent: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Tue 2006-03-21 17:10:18 -0500
message:
merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
parent: pqm at pqm.ubuntu.com-20060321193708-d329560812aeb569
parent: abentley at panoramicfeedback.com-20060317203944-1d9d5fee7c4e92d5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-21 22:04:28 +0000
message:
Fixed master locking in commit
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060317203944-1d9d5fee7c4e92d5
parent: pqm at pqm.ubuntu.com-20060316205342-c9d4ed939a36dda4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.masterborked
timestamp: Fri 2006-03-17 15:39:44 -0500
message:
Fixed master locking in commit
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060321193708-d329560812aeb569
parent: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
parent: abentley at panoramicfeedback.com-20060321142852-a62401b4cd22094c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-21 19:37:08 +0000
message:
Update NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060321142852-a62401b4cd22094c
parent: aaron.bentley at utoronto.ca-20060319165929-47a28bbe23d57f29
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.repo.ui
timestamp: Tue 2006-03-21 09:28:52 -0500
message:
Update NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060319165929-47a28bbe23d57f29
parent: aaron.bentley at utoronto.ca-20060318224432-8179961a7ab9ee68
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.repo.ui
timestamp: Sun 2006-03-19 11:59:29 -0500
message:
Updated tests per Robert Collins' suggestions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318224432-8179961a7ab9ee68
parent: aaron.bentley at utoronto.ca-20060318192552-dd8407119401aa12
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.repo.ui
timestamp: Sat 2006-03-18 17:44:32 -0500
message:
Bugfix when result_repo is None
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318192552-dd8407119401aa12
parent: aaron.bentley at utoronto.ca-20060318174435-bd5f5fcbac2fae92
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.repo.ui
timestamp: Sat 2006-03-18 14:25:52 -0500
message:
Don't create unwanted working trees in branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060318174435-bd5f5fcbac2fae92
parent: aaron.bentley at utoronto.ca-20060317130304-2c4f95e689b729b0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Sat 2006-03-18 12:44:35 -0500
message:
Renamed make-repo init-repo
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317130304-2c4f95e689b729b0
parent: aaron.bentley at utoronto.ca-20060317125810-aab432467aad9ebe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 08:03:04 -0500
message:
Added tests for branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317125810-aab432467aad9ebe
parent: aaron.bentley at utoronto.ca-20060317070940-df789963405ca005
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 07:58:10 -0500
message:
Added bzr init test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317070940-df789963405ca005
parent: aaron.bentley at utoronto.ca-20060317065921-ed1f40918a909376
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 02:09:40 -0500
message:
Init command can produce sharing branches
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317065921-ed1f40918a909376
parent: aaron.bentley at utoronto.ca-20060317053543-10e90c8ccf40122c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 01:59:21 -0500
message:
Created *shared* repositories...
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060317053543-10e90c8ccf40122c
parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's integration
timestamp: Fri 2006-03-17 00:35:43 -0500
message:
Added make-repository command
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
parent: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
parent: aaron.bentley at utoronto.ca-20060319165929-47a28bbe23d57f29
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-03-21 14:37:13 +0000
message:
Add repository support on the commandline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060321144742-81f3405d3ede7519
parent: aaron.bentley at utoronto.ca-20060319174208-c580f1144110ac11
parent: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab.integration
timestamp: Tue 2006-03-21 09:47:42 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060319174208-c580f1144110ac11
parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2006-03-19 12:42:08 -0500
message:
Merge from mainline
------------------------------------------------------------
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.
More information about the bazaar-commits
mailing list