Rev 5474: Merge 2.2 into trunk including fixes for bug #651706 and bug #646133 in http://bazaar.launchpad.net/~vila/bzr/integration/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Oct 8 11:50:53 BST 2010
At http://bazaar.launchpad.net/~vila/bzr/integration/
------------------------------------------------------------
revno: 5474 [merge]
revision-id: v.ladeuil+lp at free.fr-20101008105051-xd4knkrohzclffic
parent: pqm at pqm.ubuntu.com-20101008071314-um52guvl7sel5r0h
parent: v.ladeuil+lp at free.fr-20101008100937-gj8xvpxavb5ts0s4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2010-10-08 12:50:51 +0200
message:
Merge 2.2 into trunk including fixes for bug #651706 and bug #646133
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2010-10-08 01:47:43 +0000
+++ b/NEWS 2010-10-08 10:50:51 +0000
@@ -111,6 +111,10 @@
Testing
*******
+* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
+ involving the pycurl https test server fail otherwise when running
+ selftest from an installed version. (Vincent Ladeuil, #651706)
+
* Fix tests that failed when run under ``LANG=C``.
(Andrew Bennetts, #632387)
@@ -557,9 +561,13 @@
needed to succesfully run the test suite for installed versions.
(Vincent Ladeuil, #644855).
-* Skip the tests that requires respecting the chmod bits when running as root.
+* Skip the tests that requires respecting the chmod bits when running as
+ root. Including the one that wasn't present in 2.1.
(Vincent Ladeuil, #646133)
+* Using bzr with `lp:` urls behind an http proxy should work.
+ (Robert Collins, #558343)
+
Improvements
************
@@ -575,6 +583,10 @@
Testing
*******
+* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
+ involving the pycurl https test server fail otherwise when running
+ selftest from an installed version. (Vincent Ladeuil, #651706)
+
* Fix tests that failed when run under ``LANG=C``.
(Andrew Bennetts, #632387)
@@ -722,6 +734,9 @@
* Skip the tests that requires respecting the chmod bits when running as root.
(Vincent Ladeuil, #646133)
+* Using bzr with `lp:` urls behind an http proxy should work.
+ (Robert Collins, #558343)
+
Improvements
************
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2010-08-25 10:20:41 +0000
+++ b/bzrlib/tests/test_transform.py 2010-10-08 10:50:51 +0000
@@ -58,6 +58,7 @@
)
from bzrlib.merge import Merge3Merger, Merger
from bzrlib.tests import (
+ features,
HardlinkFeature,
SymlinkFeature,
TestCase,
@@ -853,6 +854,7 @@
rename.apply()
def test_rename_fails(self):
+ self.requireFeature(features.not_running_as_root)
# see https://bugs.launchpad.net/bzr/+bug/491763
create, root_id = self.get_transform()
first_dir = create.new_directory('first-dir', root_id, 'first-id')
=== modified file 'doc/en/user-guide/branching_a_project.txt'
--- a/doc/en/user-guide/branching_a_project.txt 2010-10-01 23:09:27 +0000
+++ b/doc/en/user-guide/branching_a_project.txt 2010-10-08 10:50:51 +0000
@@ -28,7 +28,7 @@
prefix indicating the transfer technology. If no prefix is given,
normal filenames are assumed. For a complete list of supported
protocols, see the ``urlspec`` online help topic or the
-`URL Identifiers <../user-reference/urlspec-help.html>`_
+`URL Identifiers <../user-reference/index.html#url-identifiers>`_
section of the Bazaar User Reference.
URLs are normally resolved relative to the root directory of the server,
=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- a/doc/en/user-guide/configuring_bazaar.txt 2010-09-27 19:31:45 +0000
+++ b/doc/en/user-guide/configuring_bazaar.txt 2010-10-08 10:50:51 +0000
@@ -66,7 +66,7 @@
email = Your Name <email at example.com>
For further details on the syntax and configuration settings supported, see
-`Configuration Settings <../user-reference/configuration-help.html>`_
+`Configuration Settings <../user-reference/index.html#configuration-settings>`_
in the Bazaar User Reference.
@@ -78,5 +78,5 @@
``BZR_HOME/rules``.
For further information on how rules are searched and the detailed syntax of
-the relevant files, see `Rules <../user-reference/rules-help.html>`_
+the relevant files, see `Rules <../user-reference/index.html#rules>`_
in the Bazaar User Reference.
=== modified file 'doc/en/user-guide/hooks.txt'
--- a/doc/en/user-guide/hooks.txt 2010-08-17 03:08:33 +0000
+++ b/doc/en/user-guide/hooks.txt 2010-10-08 10:50:51 +0000
@@ -8,7 +8,7 @@
perform actions before or after certain Bazaar operations. The operations
include ``commit``, ``push``, ``pull``, and ``uncommit``.
For a complete list of hooks and their parameters, see `Hooks
-<../user-reference/hooks-help.html>`_ in the User Reference.
+<../user-reference/index.html#hooks>`_ in the User Reference.
Most hooks are run on the client, but a few are run on the server. (Also
see the `push-and-update plugin`_ that handles one special case of
=== modified file 'doc/en/user-guide/sending_changes.txt'
--- a/doc/en/user-guide/sending_changes.txt 2010-09-27 19:31:45 +0000
+++ b/doc/en/user-guide/sending_changes.txt 2010-10-08 10:50:51 +0000
@@ -42,7 +42,7 @@
``send`` without options will create a merge directive, fire up your email
tool and attach it, ready for you to add the explanatory text bit.
(See the online help for ``send`` and
-`Configuration Settings <../user-reference/configuration-help.html>`_
+`Configuration Settings <../user-reference/index.html#configuration-settings>`_
in the User Reference for further details on how to configure this.)
Most projects like people to add some explanation to the mail along with
=== modified file 'doc/en/user-guide/setting_up_email.txt'
--- a/doc/en/user-guide/setting_up_email.txt 2010-09-27 19:31:45 +0000
+++ b/doc/en/user-guide/setting_up_email.txt 2010-10-08 10:50:51 +0000
@@ -74,7 +74,7 @@
For more information on the ini file format, see `Configuration Settings`_ in
the Bazaar User Reference.
-.. _Configuration Settings: ../user-reference/configuration-help.html
+.. _Configuration Settings: ../user-reference/index.html#configuration-settings
Setting email on a per-branch basis
-----------------------------------
=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- a/doc/en/user-guide/specifying_revisions.txt 2010-09-27 19:31:45 +0000
+++ b/doc/en/user-guide/specifying_revisions.txt 2010-10-08 10:50:51 +0000
@@ -65,7 +65,7 @@
For complete details, see `Revision Identifiers`_ in the
Bazaar User Reference.
-.. _Revision Identifiers: ../user-reference/revisionspec-help.html
+.. _Revision Identifiers: ../user-reference/index.html#revision-identifiers
Numbers
~~~~~~~
=== modified file 'doc/en/user-guide/version_info.txt'
--- a/doc/en/user-guide/version_info.txt 2010-09-27 19:31:45 +0000
+++ b/doc/en/user-guide/version_info.txt 2010-10-08 10:50:51 +0000
@@ -87,7 +87,7 @@
variables that can be used in templates, see `Version Info`_ in the
Bazaar User Reference.
-.. _Version Info: ../user-reference/version-info-help.html
+.. _Version Info: ../user-reference/index.html#version-info
Predefined formats for dumping version information in specific languages
are currently in development. Please contact us on the mailing list about
=== modified file 'doc/en/whats-new/whats-new-in-2.2.txt'
--- a/doc/en/whats-new/whats-new-in-2.2.txt 2010-08-20 03:53:57 +0000
+++ b/doc/en/whats-new/whats-new-in-2.2.txt 2010-10-06 16:27:25 +0000
@@ -22,7 +22,12 @@
Over 120 bugs have been fixed in total. See the
:doc:`../release-notes/index` for a full list.
-Bazaar 2.2.0 is fully compatible both locally and on the network with 2.0
+Bazaar 2.2.1 includes all the fixes from 2.1.3 and 2.0.6 (that
+weren't included in 2.20).
+
+See the :doc:`../release-notes/index` for details.
+
+Bazaar 2.2 is fully compatible both locally and on the network with 2.0
and 2.1, and can read and write repositories generated by all previous
versions.
=== modified file 'setup.py'
--- a/setup.py 2010-08-02 19:56:52 +0000
+++ b/setup.py 2010-09-30 08:49:08 +0000
@@ -66,6 +66,7 @@
'package_data': {'bzrlib': ['doc/api/*.txt',
'tests/test_patches_data/*',
'help_topics/en/*.txt',
+ 'tests/ssl_certs/ca.crt',
'tests/ssl_certs/server_without_pass.key',
'tests/ssl_certs/server_with_pass.key',
'tests/ssl_certs/server.crt'
More information about the bazaar-commits
mailing list