Rev 3332: merge down-thread in file:///v/home/vila/src/bzr/experimental/faster-selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Apr 1 09:40:29 BST 2008
At file:///v/home/vila/src/bzr/experimental/faster-selftest/
------------------------------------------------------------
revno: 3332
revision-id: v.ladeuil+lp at free.fr-20080401084023-4doza5jjv66r9c7s
parent: v.ladeuil+lp at free.fr-20080331165919-au2pd7n8yug3ls89
parent: v.ladeuil+lp at free.fr-20080401083930-6jak7atgwu3q00yr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: use-filter-by-module-test-loader
timestamp: Tue 2008-04-01 10:40:23 +0200
message:
merge down-thread
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3313.1.13
revision-id: v.ladeuil+lp at free.fr-20080401083930-6jak7atgwu3q00yr
parent: v.ladeuil+lp at free.fr-20080331171715-ovu1ubxwv10nvxit
parent: v.ladeuil+lp at free.fr-20080331172008-o31h3ai3qb8vwjx4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filter-by-module-test-loader
timestamp: Tue 2008-04-01 10:39:30 +0200
message:
merge down-thread
------------------------------------------------------------
revno: 3308.1.10
revision-id: v.ladeuil+lp at free.fr-20080331172008-o31h3ai3qb8vwjx4
parent: v.ladeuil+lp at free.fr-20080331171123-d1aihpfvqnx6u8mp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-31 19:20:08 +0200
message:
Add an optional loader parameter needed when deploying the (upcoming)
FilteredByModuleTestLoader for parametrized inventory_implementations and
repository_implementations tests.
* bzrlib/tests/__init__.py:
(multiply_tests_from_modules): Add an optional loader parameter.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3313.1.12
revision-id: v.ladeuil+lp at free.fr-20080331171715-ovu1ubxwv10nvxit
parent: v.ladeuil+lp at free.fr-20080331161703-0ueczeko01f5bf2v
parent: v.ladeuil+lp at free.fr-20080331171123-d1aihpfvqnx6u8mp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filter-by-module-test-loader
timestamp: Mon 2008-03-31 19:17:15 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3308.1.9
revision-id: v.ladeuil+lp at free.fr-20080331171123-d1aihpfvqnx6u8mp
parent: v.ladeuil+lp at free.fr-20080330202829-5ups6isujc9z5p8i
parent: pqm at pqm.ubuntu.com-20080331105632-qxz6ssqxpb7sb0hv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-refactoring
timestamp: Mon 2008-03-31 19:11:23 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3302.3.17
revision-id: pqm at pqm.ubuntu.com-20080331105632-qxz6ssqxpb7sb0hv
parent: pqm at pqm.ubuntu.com-20080331091745-r831hmhda7j4nm54
parent: v.ladeuil+lp at free.fr-20080331071645-hhly8l5lhub9swse
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-31 11:56:32 +0100
message:
(vila) Trivial test suite fixes
modified:
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.16.1
revision-id: v.ladeuil+lp at free.fr-20080331071645-hhly8l5lhub9swse
parent: pqm at pqm.ubuntu.com-20080331043759-0a8hhft91h108mh7
parent: v.ladeuil+lp at free.fr-20080330201640-cqg11m8ay5bn095n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2008-03-31 09:16:45 +0200
message:
Trivial test suite fixes
modified:
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.3.16
revision-id: pqm at pqm.ubuntu.com-20080331091745-r831hmhda7j4nm54
parent: pqm at pqm.ubuntu.com-20080331043759-0a8hhft91h108mh7
parent: ian.clatworthy at canonical.com-20080331074301-ajsv9sp8omhynfv6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-31 10:17:45 +0100
message:
Fix wording in the checkouts help topic (James Westby)
modified:
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3302.15.1
revision-id: ian.clatworthy at canonical.com-20080331074301-ajsv9sp8omhynfv6
parent: pqm at pqm.ubuntu.com-20080331043759-0a8hhft91h108mh7
parent: jw+debian at jameswestby.net-20080329125721-o02k3osp4gyl03wk
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Mon 2008-03-31 17:43:01 +1000
message:
Fix wording in the checkouts help topic (James Westby)
modified:
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3302.14.1
revision-id: jw+debian at jameswestby.net-20080329125721-o02k3osp4gyl03wk
parent: pqm at pqm.ubuntu.com-20080327064129-8egj1nnju8z9v91b
committer: James Westby <jw+debian at jameswestby.net>
branch nick: temp
timestamp: Sat 2008-03-29 12:57:21 +0000
message:
Fix wording in the checkouts help topic.
modified:
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3302.3.15
revision-id: pqm at pqm.ubuntu.com-20080331043759-0a8hhft91h108mh7
parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
parent: ian.clatworthy at canonical.com-20080331030147-qw6kujrfdue15q7g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-31 05:37:59 +0100
message:
bzr main script cannot be imported (Benjamin Peterson)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
------------------------------------------------------------
revno: 3302.13.1
revision-id: ian.clatworthy at canonical.com-20080331030147-qw6kujrfdue15q7g
parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
parent: musiccomposition at gmail.com-20080314022140-iwkxff9kly0vtb1a
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Mon 2008-03-31 13:01:47 +1000
message:
bzr main script cannot be imported (Benjamin Peterson)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
------------------------------------------------------------
revno: 3275.2.1
revision-id: musiccomposition at gmail.com-20080314022140-iwkxff9kly0vtb1a
parent: pqm at pqm.ubuntu.com-20080314011927-hi5bdap69742g7zn
committer: Benjamin Peterson <musiccomposition at gmail.com>
branch nick: no-bzr-import
timestamp: Thu 2008-03-13 21:21:40 -0500
message:
Made importing the bzr script raise an ImportError
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-03-28 07:24:55 +0000
+++ b/NEWS 2008-03-31 03:01:47 +0000
@@ -12,6 +12,8 @@
CHANGES:
+ * bzr main script cannot be imported (Benjamin Peterson)
+
* When a plugin cannot be loaded as the file path is not a valid
python module name bzr will now strip a ``bzr_`` prefix from the
front of the suggested name, as many plugins (e.g. bzr-svn)
@@ -151,7 +153,7 @@
(Alexander Belchenko)
* Restore auto-detection of plink.exe on Windows. (Dmitry Vasiliev)
-
+
* Version number is now shown as "1.2" or "1.2pr2", without zeroed or
missing final fields. (Martin Pool)
=== modified file 'bzr'
--- a/bzr 2008-03-17 02:26:35 +0000
+++ b/bzr 2008-03-31 03:01:47 +0000
@@ -129,4 +129,4 @@
bzrlib.trace._trace_file.flush()
os._exit(exit_val)
else:
- pass # should this give an error? - it can't be used as a lib
+ raise ImportError("The bzr script cannot be imported.")
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py 2008-03-25 22:53:22 +0000
+++ b/bzrlib/help_topics/__init__.py 2008-03-29 12:57:21 +0000
@@ -350,10 +350,10 @@
Lightweight checkouts work best when you have fast reliable access to the
master branch. This means that if the master branch is on the same disk or LAN
a lightweight checkout will be faster than a heavyweight one for any commands
-that modify the revision history (as only one copy branch needs to be updated).
-Heavyweight checkouts will generally be faster for any command that uses the
-history but does not change it, but if the master branch is on the same disk
-then there wont be a noticeable difference.
+that modify the revision history (as only one copy of the branch needs to
+be updated). Heavyweight checkouts will generally be faster for any command
+that uses the history but does not change it, but if the master branch is on
+the same disk then there won't be a noticeable difference.
Another possible use for a checkout is to use it with a treeless repository
containing your branches, where you maintain only one working tree by
More information about the bazaar-commits
mailing list