Rev 4872: Merge 2.1 in file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.1/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.1/

------------------------------------------------------------
revno: 4872 [merge]
revision-id: v.ladeuil+lp at free.fr-20101130204117-rf74wrznxk2zzxl0
parent: v.ladeuil+lp at free.fr-20101126181001-usykban3mhatv9a2
parent: pqm at pqm.ubuntu.com-20101130195532-r7mn83a3bzn40j8x
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 583667-lp-no-edge-2.1
timestamp: Tue 2010-11-30 21:41:17 +0100
message:
  Merge 2.1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-11-26 16:19:57 +0000
+++ b/NEWS	2010-11-30 20:41:17 +0000
@@ -13,12 +13,13 @@
 Compatibility Breaks
 ********************
 
-* The ``edge.launchpad.net`` server has been deprecated and all references to
-  it have been removed from the code base. This ensures that users upgrading
-  to bzr 2.0.7 or better will never try to contact the 'edge' server. Users of
-  previous versions can workaround connection problems by setting the
-  ``BZR_LP_XMLRPC_URL`` environment variable to
-  ``http://xmlrpc.launchpad.net/bazaar/``.  (Vincent Ladeuil, #583667)
+* Launchpad has announced that the ``edge.launchpad.net`` instance is
+  deprecated and may be shut down in the future
+  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
+  been updated in this release to talk to the main (``launchpad.net``) servers,
+  rather than the ``edge`` ones. Users of previous versions can workaround
+  connection problems by setting the ``BZR_LP_XMLRPC_URL`` environment variable
+  to ``http://xmlrpc.launchpad.net/bazaar/``.  (Vincent Ladeuil, #583667)
 
 New Features
 ************
@@ -135,6 +136,54 @@
   (Martin Pool, John Arbash Meinel)
 
 
+bzr 2.0.7
+#########
+
+:2.0.7: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+* Launchpad has announced that the ``edge.launchpad.net`` instance is
+  deprecated and may be shut down in the future
+  <http://blog.launchpad.net/general/edge-is-deprecated>.  Bazaar has therefore
+  been updated in this release to talk to the main (``launchpad.net``) servers,
+  rather than the ``edge`` ones. Users of previous versions can workaround
+  connection problems by setting the ``BZR_LP_XMLRPC_URL`` environment variable
+  to ``http://xmlrpc.launchpad.net/bazaar/``.  (Vincent Ladeuil, #583667)
+
+New Features
+************
+
+Bug Fixes
+*********
+
+* Skip tests that needs a bzr source tree when there isn't one. This is
+  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.
+  (Vincent Ladeuil, #646133)
+
+* Using bzr with `lp:` urls behind an http proxy should work.
+  (Robert Collins, #558343)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 bzr 2.0.6
 #########
 
@@ -2090,7 +2139,7 @@
   
 * The ``--hardlink`` option to ``branch`` and ``checkout`` is not
   supported at the moment on workingtree formats that can do content
-  filtering.  (See <https://bugs.edge.launchpad.net/bzr/+bug/408193>.)
+  filtering.  (See <https://bugs.launchpad.net/bzr/+bug/408193>.)
   bzr now says so, rather than just ignoring the option.  (Martin Pool)
 
 * There was a bug in ``osutils.relpath`` that was only triggered on