Rev 6514: News entries should not be duplicated when merging up into newer series. in file:///home/vila/src/bzr/releases/2.5/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/releases/2.5/

------------------------------------------------------------
revno: 6514
revision-id: v.ladeuil+lp at free.fr-20130525171158-z8jkbq67uadwavxl
parent: pqm at pqm.ubuntu.com-20130523100008-23bj7tfh34p6wqj0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.5
timestamp: Sat 2013-05-25 19:11:58 +0200
message:
  News entries should not be duplicated when merging up into newer series.
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2013-05-23 09:27:10 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2013-05-25 17:11:58 +0000
@@ -35,10 +35,6 @@
 * ``bzr config`` properly handles aliases and references in the
   ``--directory`` parameter (Vincent Ladeuil, Wouter van Heyst, #947049)
 
-* Fix a traceback when trying to checkout a tree that also has an entry
-  with file-id `TREE_ROOT` somewhere other than at the root directory.
-  (John Arbash Meinel, #830947)
-
 * Lightweight checkouts of remote repositories had a bug with how they
   extracted texts from the repository. (Just an ordering constraint on how
   they consumed the stream.) (John Arbash Meinel, #1046284)
@@ -52,10 +48,6 @@
 
 * Revert use of --no-tty when gpg signing commits. (Jelmer Vernooij, #1014570)
 
-* Some filesystems give ``EOPNOTSUPP`` when trying to call ``fdatasync``.
-  This shouldn't be treated as a fatal error.
-  (John Arbash Meinel, #1075108)
-
 * Some small bug fixes wrt lightweight checkouts and remote repositories.
   A test permutation was added that runs all working tree tests against a
   lightweight checkout. (John Arbash Meinel, #1046697)