Rev 1716: Merge bzr.dev. in /home/robertc/source/baz/workingtree/
Robert Collins
robertc at robertcollins.net
Thu May 18 11:43:10 BST 2006
------------------------------------------------------------
revno: 1716
revision-id: robertc at robertcollins.net-20060518104308-f39dbc2d45b0d586
parent: robertc at robertcollins.net-20060518103123-312dec1356f5be49
parent: robertc at robertcollins.net-20060518084156-518f0123339cbace
committer: Robert Collins <robertc at robertcollins.net>
branch nick: workingtree
timestamp: Thu 2006-05-18 20:43:08 +1000
message:
Merge bzr.dev.
added:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518084156-518f0123339cbace
parent: robertc at robertcollins.net-20060518082157-34fc7fa5f1dcfe7e
parent: robertc at robertcollins.net-20060515050657-7232e2d1f6895fae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 18:41:56 +1000
message:
Make the test test_time_creates_benchmark_in_result more robust to timing variation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060515050657-7232e2d1f6895fae
parent: robertc at robertcollins.net-20060515045922-1c5ab33f70e633da
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Mon 2006-05-15 15:06:57 +1000
message:
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060515045922-1c5ab33f70e633da
parent: robertc at robertcollins.net-20060511023227-2e2f141686184d01
parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Mon 2006-05-15 14:59:22 +1000
message:
Merge integration, fixing test failure in test_too_much due to terminal width changing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060511023227-2e2f141686184d01
parent: robertc at robertcollins.net-20060509015717-952b5d71d0cc2897
parent: robertc at robertcollins.net-20060511022331-d482c578c078f122
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Thu 2006-05-11 12:32:27 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518082157-34fc7fa5f1dcfe7e
parent: robertc at robertcollins.net-20060518080510-f54771ada912624f
parent: robertc at robertcollins.net-20060518072303-246ee1e508d25473
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 18:21:57 +1000
message:
Merge 'bzr add' verbosity improvements.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518072303-246ee1e508d25473
parent: robertc at robertcollins.net-20060518071008-96bc24f18116be36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Thu 2006-05-18 17:23:03 +1000
message:
Add new test_add file - should have been in last commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518071008-96bc24f18116be36
parent: robertc at robertcollins.net-20060518004813-4d402a53ede4e8f6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Thu 2006-05-18 17:10:08 +1000
message:
'bzr add' is now less verbose in telling you what ignore globs were
matched by files being ignored. Instead it just tells you how many were ignored
(because you might reasonably be expecting none to be ignored). 'bzr add -v' is
unchanged and will report every ignored file. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518080510-f54771ada912624f
parent: robertc at robertcollins.net-20060518073629-cd6cb49e26789ced
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 18:05:10 +1000
message:
Oops, fixup the blackbox test we started with.
More information about the bazaar-commits
mailing list