Rev 5182: (vila) Fix NEWS entries incorrectly attributed to 2.2b2 instead of in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5182 [merge]
revision-id: pqm at pqm.ubuntu.com-20100423182030-jl0jz21lm256tpyv
parent: pqm at pqm.ubuntu.com-20100423165712-y00wbjl9yagw4g3q
parent: v.ladeuil+lp at free.fr-20100423141523-r0loszwxgtdms9jm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-04-23 19:20:30 +0100
message:
  (vila) Fix NEWS entries incorrectly attributed to 2.2b2 instead of
  	2.0.6 or 2.2b3
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2010-04-23 11:11:22 +0000
+++ b/NEWS	2010-04-23 14:15:23 +0000
@@ -16,15 +16,43 @@
 New Features
 ************
 
+* ``bzr ignore`` now supports a ``--default-rules`` option that displays
+  the default ignore rules used by bzr. The flag ``--old-default-rules``
+  is no longer supported by ``ignore``.
+  (Parth Malwankar, #538703)
+
+* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
+  can save disk space by deleting obsolete pack files created during the
+  pack operation.
+  (Parth Malwankar, #304320)
+
 Bug Fixes
 *********
 
+* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
+  (Vincent Ladeuil, #566670)
+
+* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
+  (Vincent Ladeuil, #563997)
+
 * Reduce peak memory by one copy of compressed text.
   (John Arbash Meinel, #566940)
 
 Improvements
 ************
 
+* ``append_revisions_only`` will no be interpreted as a boolean and a
+  warning emitted if illegal values are used. Note that for projects
+  that needs to maintain compatibility with previsous bzr versions,
+  only 'True' and 'False' strings must be used (previous versions of
+  bzr will interpret all strings differing from 'True'
+  (case-sensitive) as false.
+  (Brian de Alwis, Vincent Ladeuil)
+
+* ``Config.get_user_option_as_bool`` will now warn if a value cannot
+  be interpreted as a boolean.
+  (Vincent Ladeuil)
+
 Documentation
 *************
 
@@ -63,16 +91,6 @@
 * ``bzr diff`` now supports a --format option, which can be used to 
   select alternative diff formats. (Jelmer Vernooij, #555994)
 
-* ``bzr ignore`` now supports a ``--default-rules`` option that displays
-  the default ignore rules used by bzr. The flag ``--old-default-rules``
-  is no longer supported by ``ignore``.
-  (Parth Malwankar, #538703)
-
-* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
-  can save disk space by deleting obsolete pack files created during the
-  pack operation.
-  (Parth Malwankar, #304320)
-
 Bug Fixes
 *********
 
@@ -91,15 +109,9 @@
   into the master branch will no longer claim that old commits have become
   pending merges. (Robert Collins, #562079)
 
-* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
-  (Vincent Ladeuil, #566670)
-
 * ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
   config as in previous versions of bzrlib. (Robert Collins)
 
-* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
-  (Vincent Ladeuil, #563997)
-
 * Fix glitch in the warning about unclean trees display.
   (Vincent Ladeuil, #562665)
 
@@ -115,12 +127,6 @@
   which is not installed any more" error.
   (Martin Pool, James Westby, #528114)
 
-* Repositories accessed via a smart server now reject being stacked on a
-  repository in an incompatible format, as is the case when accessing them
-  via other methods.  This was causing fetches from those repositories via
-  a smart server (e.g. using ``bzr branch``) to receive invalid data.
-  (Andrew Bennetts, #562380)
-
 * Reset ``siginterrupt`` flag to False every time we handle a signal
   installed with ``set_signal_handler(..., restart_syscall=True)`` (from
   ``bzrlib.osutils``.  Reduces the likelihood of "Interrupted System Call"
@@ -576,18 +582,6 @@
 Improvements
 ************
 
-* ``append_revisions_only`` will no be interpreted as a boolean and a
-  warning emitted if illegal values are used. Note that for projects
-  that needs to maintain compatibility with previsous bzr versions,
-  only 'True' and 'False' strings must be used (previous versions of
-  bzr will interpret all strings differing from 'True'
-  (case-sensitive) as false.
-  (Brian de Alwis, Vincent Ladeuil)
-
-* ``Config.get_user_option_as_bool`` will now warn if a value cannot
-  be interpreted as a boolean.
-  (Vincent Ladeuil)
-
 * Fetching into experimental formats will now print a warning. (Jelmer
   Vernooij)
 
@@ -912,6 +906,11 @@
   permissions as ``.bzr`` directory on a POSIX OS.
   (Parth Malwankar, #262450)
 
+* Repositories accessed via a smart server now reject being stacked on a
+  repository in an incompatible format, as is the case when accessing them
+  via other methods.  This was causing fetches from those repositories via
+  a smart server (e.g. using ``bzr branch``) to receive invalid data.
+  (Andrew Bennetts, #562380)
 
 bzr 2.0.5
 #########