Rev 5490: (mbp) clean up news sections (Martin Pool) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Oct 13 05:31:54 BST 2010


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

------------------------------------------------------------
revno: 5490 [merge]
revision-id: pqm at pqm.ubuntu.com-20101013043153-ki2mvt5miuxbun8l
parent: pqm at pqm.ubuntu.com-20101012112358-2j201bv0jyyi52s4
parent: mbp at sourcefrog.net-20101013034721-sj95vv29bj300eq5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-10-13 05:31:53 +0100
message:
  (mbp) clean up news sections (Martin Pool)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  NEWS-template.txt              newstemplate.txt-20100219053124-f4a3zo3ujiyawh7n-1
=== modified file 'NEWS'
--- a/NEWS	2010-10-12 09:46:37 +0000
+++ b/NEWS	2010-10-13 03:47:21 +0000
@@ -10,8 +10,10 @@
 
 :2.3b3: NOT RELEASED YET
 
-Compatibility Breaks
-********************
+External Compatibility Breaks
+*****************************
+
+(none)
 
 New Features
 ************
@@ -31,6 +33,9 @@
   default format for new branches created with ``bzr init``.
   (Neil Martinsen-Burrell, #484101)
 
+Improvements
+************
+
 Bug Fixes
 *********
 
@@ -45,9 +50,6 @@
 
 * Make ``bzr tag --quiet`` really quiet. (Neil Martinsen-Burrell, #239523)
 
-Improvements
-************
-
 Documentation
 *************
 
@@ -70,8 +72,8 @@
 
 :2.3b2: 2010-10-08
 
-Compatibility Breaks
-********************
+External Compatibility Breaks
+*****************************
 
 * The ``bzr tags`` command sorts tag names using a natural sort by
   default (so tag2 sorts before tag10).  The previous default was
@@ -100,17 +102,32 @@
   Also, bzr will recognize if the 'ssh' comand is a symlink to lsh.
   (Matthew Gordon, #374700)
 
-* The ``pull`` and ``update`` commands now take a ``-show-base``
+* The ``pull`` and ``update`` commands now take a ``--show-base``
   option that, in the case of conflicts, shows the base revision text.
   (Rory Yorke,  #202374)
 
-Bug Fixes
-*********
+Improvements
+************
 
 * ``bzr break-lock --force`` breaks the lock without prompting.  (Before
   using this, make sure the process holding the lock really is dead.)
   (Martin Pool, #397315)
 
+* ``bzr remove`` now takes a ``--no-backup`` option for when you don't want it
+  to backup anything, just delete it. This option used to be called ``--force``
+  which is now deprecated.
+  (Marius Kruger, #400554)
+
+* When using the pycurl client module, Bazaar shows some of the text from
+  http server error messages.
+  (Martin Pool, #656667)
+
+Bug Fixes
+*********
+
+* Don't force openssh to use protocol=2, since that is now the default.
+  (Neil Martinsen-Burrell, #561061)
+
 * Fix signature of RemoteBzrDir.create_workingtree to match that of its
   superclass.  (Neil Martinsen-Burrell, Martin Pool, #524627)
 
@@ -121,31 +138,12 @@
   when using the rio format (with non-ascii information) on a non-utf-8
   terminal.  (Andrej A Antonov, #518609)
 
-* 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)
-
 * Treat all IO, OS, and socket errors consistently when establishing
   SSH/SFTP connections via a subprocess.  (Andrew Bennetts)
 
 * ``unshelve --preview`` now can show diff in a non-ascii encoding.
   (Andrej A Antonov, #518916)
 
-Improvements
-************
-
-* ``bzr remove`` now takes a ``--no-backup`` option for when you don't want it
-  to backup anything, just delete it. This option used to be called ``--force``
-  which is now deprecated.
-  (Marius Kruger, #400554)
-
-* When using the pycurl client module, Bazaar shows some of the text from
-  http server error messages.
-  (Martin Pool, #656667)
-
 Documentation
 *************
 
@@ -192,6 +190,13 @@
 * Fix tests that failed when run under ``LANG=C``.
   (Andrew Bennetts, #632387)
 
+* 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)
+
 * Suppress the "maximum recursion depth exceeded in __subclasscheck__"
   warning on stderr emitted during ``test_dict_deepnested`` in
   ``bzrlib/tests/test__bencode.py``.  (Andrew Bennetts)
@@ -221,140 +226,10 @@
 its own.
 
 
-Compatibility Breaks
-********************
-
-* BzrError subclasses no longer support the name "message" to be used
-  as an argument for __init__ or in _fmt format specification as this
-  breaks in some Python versions. errors.LockError.__init__ argument
-  is now named "msg" instead of earlier "message".
-  (Parth Malwankar, #603461)
-
-* Additional merges after an unrelated branch has been merged with its
-  history no longer crash when deleted files are involved.
-  (Vincent Ladeuil, John Arbash Meinel, #375898)
-
-* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
-  previously-unversioned directory within the tree: the directory is
-  marked versioned too.
-  (Martin Pool, #192859)
-
-* ``bzr commit SYMLINK`` now works, rather than trying to commit the
-  target of the symlink.
-  (Martin Pool, John Arbash Meinel, #128562)
-
-* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
-  permissions as ``.bzr`` directory on a POSIX OS.
-  (Parth Malwankar, #262450)
-
-* ``bzrlib.transform.TreeTransformBase.final_kind``,
-  ``bzrlib.transform.TreeTransform.tree_kind`` and
-  ``bzrlib.transform.TransformPreview.tree_kind`` now return None instead
-  of raising NoSuchFile.  (Vincent Ladeuil)
-
-* CommitBuilder now uses the committer instead of _config.username to generate
-  the revision-id.  (Aaron Bentley, #614404)
-
-* Configuration files in ``${BZR_HOME}`` are now written in an atomic
-  way which should help avoid problems with concurrent writers.
-  (Vincent Ladeuil, #525571)
-
-* `ControlDirFormat` and  `ControlDir` have been split out of `BzrDirFormat`
-  and `BzrDir`, respectively. `ControlDirFormat`
-  and `ControlDir` should be used as the base classes for new non-.bzr
-  implementations.
-
-  `BzrDirFormat.register_control_format` has been renamed to
-  `ControlDirFormat.register_format`.
-
-  `BzrDirFormat.register_server_control_format` has been removed.
-
-  Probing for control directories is now done by separate objects derived
-  from `bzrlib.controldir.Prober` and registered using
-  `bzrlib.controldir.ControlDirFormat.register_prober` or
-  `bzrlib.controldir.ControlDirFormat.register_server_prober`.
-  `BzrDirFormat.probe_transport` has been moved onto `Prober`.
-
-  `BzrDirFormat.register_format` has been renamed to
-  `BzrProber.register_bzrdir_format`.
-
-  `bzrlib.bzrdir.network_format_registry` has been moved to
-  `bzrlib.controldir`.
-
-  (Jelmer Vernooij)
-
-* Cope with Microsoft FTP server that returns reply '250 Directory
-  created' when mkdir succeeds.  (Martin Pool, #224373)
-
-* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
-  contains only NUL bytes).  Instead warn the user, and allow ``bzr
-  break-lock`` to remove it.  (Andrew Bennetts, #619872)
-  
-* `decode` parameter to get() method in FtpTransport and GioTransport classes
-  is deprecated. (Alexander Belchenko)
-
-* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
-  longer raised.
-  (Martin Pool)
-
-* Fix ``AttributeError on parent.children`` when adding a file under a
-  directory that was a symlink in the previous commit.
-  (Martin Pool, #192859)
-
-* Fix ``AttributeError: 'NoneType' object has no attribute 'close'`` in
-  ``_close_ssh_proc`` when using ``bzr+ssh://``.  This was causing
-  connections to pre-1.6 bzr+ssh servers to fail, and causing warnings on
-  stderr in some other circumstances.  (Andrew Bennetts, #633745)
-
-* Only call ``setlocale`` in the bzr startup script on posix systems. This
-  avoids an issue with the newer windows C runtimes used by Python 2.6 and
-  later which can mangle bytestrings printed to the console.
-  (Martin [gz], #631350)
-
-* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
-  which can result in "missing referenced chk root keys" errors when
-  fetching from repositories with affected revisions.
-  (Andrew Bennetts, #522637)
-
-* Raise ValueError instead of a string exception.
-  (John Arbash Meinel, #586926)
-
-* Reduce peak memory by one copy of compressed text.
-  (John Arbash Meinel, #566940)
-
-* 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)
-
-* Selftest with versions of subunit that support ``stopTestRun`` will no longer
-  error. This error was caused by 2.0 not being updated when upstream
-  python merged the end of run patch, which chose ``stopTestRun`` rather than
-  ``done``. (Robert Collins, #571437)
-
-* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
-  being thrown from ``xml_serializer`` on certain cElementTree setups.
-  (Martin [gz], #254278)
-
-* The old ``bzr selftest --benchmark`` option has been removed.
-  <https://launchpad.net/bzr-usertest> is an actively-maintained
-  macrobenchmark suite.
-  (Martin Pool)
-
-* `tree_files` and `internal_tree_files` are now deprecated in favor of
-  `WorkingTree.open_containing_paths`.
-  (Martin Pool)
-
-* Upgrading or fetching from a non-rich-root repository to a rich-root
-  repository (e.g. from pack-0.92 to 2a) no longer fails with
-  ``'Inter1and2Helper' object has no attribute 'source_repo'``.  This was
-  a regression from Bazaar 2.1.  (Andrew Bennetts, #636930)
-  
-* When passing a file to ``UTF8DirReader`` make sure to close the current
-  directory file handle after the chdir fails. Otherwise when passing many
-  filenames into a command line ``bzr status`` we would leak descriptors.
-  (John Arbash Meinel, #583486)
+External Compatibility Breaks
+*****************************
+
+(none)
 
 New Features
 ************
@@ -380,29 +255,97 @@
 * New development format ``development8-subtree`` which is similar to the 
   ``2a`` format and adds subtree support. (Jelmer Vernooij)
 
-Bug Fixes
-*********
+Improvements
+************
 
-* Allow using both --using and --diff-options. 
+* Allow using both ``--using`` and ``--diff-options``.
   (Matthäus G. Chajdas, #234708)
 
 * Allow using non-integer bug ID with generic bug trackers.
   (Alexandre Garnier, #440472)
 
+* ``bzr remove`` now just backs up changed files instead of exiting,
+  forcing you to choose to either keep or delete them. Bazaar will now delete
+  the files if they can easily be recovered using revert, otherwise they
+  will be backed up (adding an extention of the form .~#~).
+  (Marius Kruger, #400554)
+
+* ``bzr revert`` and ``bzr status`` are up to 15% faster on large trees
+  with many changes by not repeatedly building a list of all file-ids.
+  (Andrew Bennetts)
+
+* Decrease memory consumption when many chk index pages are loaded. (Such
+  as during ``bzr co`` or ``bzr ls -R`` of a large tree.) Often we need to
+  read many chk pages because the individual chk map nodes will be spread
+  randomly. Peak memory for 'bzr ls -R' on a large tree dropped from 396MB
+  down to 247MB, expect even more significant savings on 64-bit platforms.
+  (John Arbash Meinel)
+
+* Decrease peak memory during ``bzr send``. The old code was caching all
+  text content and all inventory strings for all revisions before
+  computing the diffs. Now we only cache as long as there is a child that
+  will need them. Sending 2000 bzr revisions drops from 1.2GB peak to
+  256MB peak. (John Arbash Meinel, #614576)
+
+* ``DirState`` internals use a little bit less memory. For bzr.dev it
+  drops the memory from 1MB down to about 800kB. And replaces a few
+  thousand tuples and sets with StaticTuple.  (John Arbash Meinel)
+
+* Inventory entries now consume less memory (on 32-bit Ubuntu file entries
+  have dropped from 68 bytes to 40, and directory entries from 120 bytes
+  to 48).  (Andrew Bennetts)
+
+* Reduce peak memory by one copy of compressed text when writing to pack
+  repositories.
+  (John Arbash Meinel, #566940)
+
+* When building new working trees, default to reading from the repository
+  rather than the source tree unless explicitly requested. (via
+  ``--files-from`` and ``--hardlink`` for ``bzr branch`` and
+  ``bzr checkout``. Generally, 2a format repositories extract
+  content faster than seeking and reading content from another tree,
+  especially in cold-cache situations. (John Arbash Meinel, #607298)
+
+* Add ``__pycache__`` to the default ``ignores`` file. Future releases of
+  Python will use this directory to store bytecodes.
+  (Andrea Corbellini, #626687)
+
+Bug Fixes
+*********
+
+* Additional merges after an unrelated branch has been merged with its
+  history no longer crash when deleted files are involved.
+  (Vincent Ladeuil, John Arbash Meinel, #375898)
+
 * ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
   previously-unversioned directory within the tree: the directory is
-  marked versioned too.  
+  marked versioned too.
   (Martin Pool, #192859)
 
-* ``bzr ignore PATTERNS`` exits with error if a bad pattern is supplied.
-  ``InvalidPattern`` exception error message now shows faulting
-  regular expression.
-  (Parth Malwankar #300062)
-
-* ``clean-tree`` issues a warning if it is unable to delete a file
+* ``bzr clean-tree`` issues a warning if it is unable to delete a file
   due to ``errno.EACCES`` instead of exiting with an error on Windows.
   (Parth Malwankar, #430785)
 
+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
+  target of the symlink.
+  (Martin Pool, John Arbash Meinel, #128562)
+
+* ``bzr ignore PATTERNS`` exits with error if a bad pattern is supplied.
+  ``InvalidPattern`` exception error message now shows faulting
+  regular expression.
+  (Parth Malwankar #300062)
+
+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
+  permissions as ``.bzr`` directory on a POSIX OS.
+  (Parth Malwankar, #262450)
+
+* CommitBuilder now uses the committer instead of _config.username to generate
+  the revision-id.  (Aaron Bentley, #614404)
+
+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
+  way which should help avoid problems with concurrent writers.
+  (Vincent Ladeuil, #525571)
+
 * CommitBuilder now uses the committer instead of _config.username to generate
   the revision-id.  (Aaron Bentley, #614404)
 
@@ -412,11 +355,8 @@
 * Cope with Microsoft FTP Server and VSFTPd that return reply '250
   Directory created' when mkdir succeeds.  (Martin Pool, #224373)
 
-* Decrease peak memory during ``bzr send``. The old code was caching all
-  text content and all inventory strings for all revisions before
-  computing the diffs. Now we only cache as long as there is a child that
-  will need them. Sending 2000 bzr revisions drops from 1.2GB peak to
-  256MB peak. (John Arbash Meinel, #614576)
+* `decode` parameter to get() method in FtpTransport and GioTransport classes
+  is deprecated. (Alexander Belchenko)
 
 * Don't print internal object name when print an invalid revision spec
   error.  (Neil Martinsen-Burrell, #598701)
@@ -443,6 +383,20 @@
 * Fix spurious paramiko warning on hardy by ensuring that ``selftest``
   properly remove its warning filter. (Vincent Ladeuil, #625686)
 
+* Fix ``AttributeError on parent.children`` when adding a file under a
+  directory that was a symlink in the previous commit.
+  (Martin Pool, #192859)
+
+* Fix ``AttributeError: 'NoneType' object has no attribute 'close'`` in
+  ``_close_ssh_proc`` when using ``bzr+ssh://``.  This was causing
+  connections to pre-1.6 bzr+ssh servers to fail, and causing warnings on
+  stderr in some other circumstances.  (Andrew Bennetts, #633745)
+
+* Fix a problem in bzr's ``Makefile`` that meant syntax errors in some
+  parts of bzr's source code could cause ``make check-nodocs`` to
+  incorrectly return an exit code of 0.
+  (Vincent Ladeuil, #626667)
+
 * ``HTTP/1.1`` test servers now set a ``Content-Length`` header to comply
   with pedantic ``HTTP/1.1`` clients. (Vincent Ladeuil, #568421)
 
@@ -458,14 +412,29 @@
 * `PathNotChild` should not give a traceback.
   (Martin Pool, #98735)
 
-* ``PQM`` will no longer ignore syntax errors in submissions.
-  (Vincent Ladeuil, #626667)
-
 * Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
   which can result in "missing referenced chk root keys" errors when
   fetching from repositories with affected revisions.
   (Andrew Bennetts, #522637)
 
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
+* 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)
+
+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
+  error. This error was caused by 2.0 not being updated when upstream
+  python merged the end of run patch, which chose ``stopTestRun`` rather than
+  ``done``. (Robert Collins, #571437)
+
+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
+  being thrown from ``xml_serializer`` on certain cElementTree setups.
+  (Martin [gz], #254278)
+
 * strace test-helper tests cope with the new Ubuntu policy of not allowing
   users to attach to their own processes by default.
   (Martin Pool, #626679)
@@ -480,51 +449,9 @@
 
 * Upgrading or fetching from a non-rich-root repository to a rich-root
   repository (e.g. from pack-0.92 to 2a) no longer fails with
-  ``'Inter1and2Helper' object has no attribute 'source_repo'``.
-  (Andrew Bennetts, #636930)
+  ``'Inter1and2Helper' object has no attribute 'source_repo'``.  This was
+  a regression from Bazaar 2.1.  (Andrew Bennetts, #636930)
   
-* Wait for the SSH server to actually finish, rather than just waiting for
-  it to negotiate the key exchange. (John Arbash Meinel, #626876)
-
-Improvements
-************
-
-* ``bzr remove`` now just backs up changed files instead of exiting,
-  forcing you to choose to either keep or delete them. Bazaar will now delete
-  the files if they can easily be recovered using revert, otherwise they
-  will be backed up (adding an extention of the form .~#~).
-  (Marius Kruger, #400554)
-
-* ``bzr revert`` and ``bzr status`` are up to 15% faster on large trees
-  with many changes by not repeatedly building a list of all file-ids.
-  (Andrew Bennetts)
-
-* Decrease memory consumption when many chk index pages are loaded. (Such
-  as during ``bzr co`` or ``bzr ls -R`` of a large tree.) Often we need to
-  read many chk pages because the individual chk map nodes will be spread
-  randomly. Peak memory for 'bzr ls -R' on a large tree dropped from 396MB
-  down to 247MB, expect even more significant savings on 64-bit platforms.
-  (John Arbash Meinel)
-
-* ``DirState`` internals use a little bit less memory. For bzr.dev it
-  drops the memory from 1MB down to about 800kB. And replaces a few
-  thousand tuples and sets with StaticTuple.  (John Arbash Meinel)
-
-* Inventory entries now consume less memory (on 32-bit Ubuntu file entries
-  have dropped from 68 bytes to 40, and directory entries from 120 bytes
-  to 48).  (Andrew Bennetts)
-
-* When building new working trees, default to reading from the repository
-  rather than the source tree unless explicitly requested. (via
-  ``--files-from`` and ``--hardlink`` for ``bzr branch`` and
-  ``bzr checkout``. Generally, 2a format repositories extract
-  content faster than seeking and reading content from another tree,
-  especially in cold-cache situations. (John Arbash Meinel, #607298)
-
-* Add ``__pycache__`` to the default ``ignores`` file. Future releases of
-  Python will use this directory to store bytecodes.
-  (Andrea Corbellini, #626687)
-
 Documentation
 *************
 
@@ -543,6 +470,46 @@
 API Changes
 ***********
 
+* When passing a file to ``UTF8DirReader`` make sure to close the current
+  directory file handle after the chdir fails. Otherwise when passing many
+  filenames into a command line ``bzr status`` we would leak descriptors.
+  (John Arbash Meinel, #583486)
+
+* `ControlDirFormat` and  `ControlDir` have been split out of `BzrDirFormat`
+  and `BzrDir`, respectively. `ControlDirFormat`
+  and `ControlDir` should be used as the base classes for new non-.bzr
+  implementations.
+
+  `BzrDirFormat.register_control_format` has been renamed to
+  `ControlDirFormat.register_format`.
+
+  `BzrDirFormat.register_server_control_format` has been removed.
+
+  Probing for control directories is now done by separate objects derived
+  from `bzrlib.controldir.Prober` and registered using
+  `bzrlib.controldir.ControlDirFormat.register_prober` or
+  `bzrlib.controldir.ControlDirFormat.register_server_prober`.
+  `BzrDirFormat.probe_transport` has been moved onto `Prober`.
+
+  `BzrDirFormat.register_format` has been renamed to
+  `BzrProber.register_bzrdir_format`.
+
+  `bzrlib.bzrdir.network_format_registry` has been moved to
+  `bzrlib.controldir`.
+
+  (Jelmer Vernooij)
+
+* ``bzrlib.transform.TreeTransformBase.final_kind``,
+  ``bzrlib.transform.TreeTransform.tree_kind`` and
+  ``bzrlib.transform.TransformPreview.tree_kind`` now return None instead
+  of raising NoSuchFile.  (Vincent Ladeuil)
+
+* BzrError subclasses no longer support the name "message" to be used
+  as an argument for __init__ or in _fmt format specification as this
+  breaks in some Python versions. errors.LockError.__init__ argument
+  is now named "msg" instead of earlier "message".
+  (Parth Malwankar, #603461)
+
 * Configuration files should now use the ``from_string`` constructor rather
   than the ``file`` parameter of the ``_get_parser`` method. The later has
   been deprecated. ``from_string`` also accept a ``save=True`` parameter to
@@ -552,7 +519,11 @@
 * Deprecate treating a `PushResult` and `PullResult` as an integer for the
   relative change in revno.
   (Martin Pool)
-  `
+
+* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
+  longer raised.
+  (Martin Pool)
+
 * ``IniBaseConfig`` objects should now use the ``from_string`` constructor
   the rather than the ``file`` parameter of the ``_get_parser`` method. The
   later has been deprecated. (Vincent Ladeuil)
@@ -573,6 +544,10 @@
   constructor has been deprecated, use the ``file_name`` parameter instead.
   (Vincent Ladeuil)
 
+* `tree_files` and `internal_tree_files` are now deprecated in favor of
+  `WorkingTree.open_containing_paths`.
+  (Martin Pool)
+
 Internals
 *********
 
@@ -582,6 +557,10 @@
 Testing
 *******
 
+* Avoid spurious failures in ssh tests: wait for the SSH server to
+  actually finish, rather than just waiting for it to negotiate the key
+  exchange. (John Arbash Meinel, #626876)
+
 * ``build_tree_contents`` can create symlinks.
   (Martin Pool, John Arbash Meinel)
 
@@ -598,6 +577,11 @@
 * Rearrange thread leak detection code to eliminate global state and make it
   possible to extend the reporting. (Martin [gz], #633462)
 
+* The old ``bzr selftest --benchmark`` option has been removed.
+  <https://launchpad.net/bzr-usertest> is an actively-maintained
+  macrobenchmark suite.
+  (Martin Pool)
+
 * The test suite now simply holds log files in memory, rather than writing them
   out to disk and then reading them back in and deleting them.
   (Andrew Bennetts)
@@ -616,7 +600,6 @@
   testtools.TestCase instances to share a details dict.
   (Andrew Bennetts, #625574)
 
-
 bzr 2.2.2
 #########
 
@@ -631,14 +614,6 @@
 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. 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)
 
@@ -664,6 +639,13 @@
 * Fix tests that failed when run under ``LANG=C``.
   (Andrew Bennetts, #632387)
 
+* 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)
+
 
 bzr 2.2.1
 #########
@@ -808,9 +790,6 @@
 * 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 'NEWS-template.txt'
--- a/NEWS-template.txt	2010-02-19 07:13:45 +0000
+++ b/NEWS-template.txt	2010-10-11 04:29:32 +0000
@@ -4,28 +4,50 @@
 :Codename: Nirvana
 :2.x.y: NOT RELEASED YET
 
-Compatibility Breaks
-********************
+External Compatibility Breaks
+*****************************
+
+.. These may require users to change the way they use Bazaar.
 
 New Features
 ************
 
+.. New commands, options, etc that users may wish to try out.
+
+Improvements
+************
+
+.. Improvements to existing commands, especially improved performance 
+   or memory usage, or better results.
+
 Bug Fixes
 *********
 
-Improvements
-************
+.. Fixes for situations where bzr would previously crash or give incorrect
+   or undesirable results.
 
 Documentation
 *************
 
+.. Improved or updated documentation.
+
 API Changes
 ***********
 
+.. Changes that may require updates in plugins or other code that uses
+   bzrlib.
+
 Internals
 *********
 
+.. Major internal changes, unlikely to be visible to users or plugin 
+   developers, but interesting for bzr developers.
+
 Testing
 *******
 
+.. Fixes and changes that are only relevant to bzr's test framework and 
+   suite.  This can include new facilities for writing tests, fixes to 
+   spurious test failures and changes to the way things should be tested.
+
 




More information about the bazaar-commits mailing list