Rev 6577: News entries should not be duplicated when merging up into newer series. in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6577
revision-id: v.ladeuil+lp at free.fr-20130527091232-vgpxbqqwjjbkjpgz
parent: pqm at pqm.ubuntu.com-20130525002324-a3vwfemjm3vlhspz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2013-05-27 11:12:32 +0200
message:
  News entries should not be duplicated when merging up into newer series.
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2013-05-23 10:04:17 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2013-05-27 09:12:32 +0000
@@ -63,10 +63,6 @@
 * ``Authentication.Config`` now always returns unicode user names and passwords.
   (Vincent Ladeuil, #514301)
 
-* 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)
-
 * Fixed a bug where the entire contents of ``/etc/mailname`` is read in.
   We only want to read in the first line so that comments could be added
   and would be ignored.
@@ -76,10 +72,6 @@
   causes breakage with docutils 0.9.1.
   (Vincent Ladeuil, Jelmer Vernooij, #1066307)
 
-* Some filesystems give ``EOPNOTSUPP`` when trying to call ``fdatasync``.
-  This shouldn't be treated as a fatal error.
-  (John Arbash Meinel, #1075108)
-
 * Warn when ``--show-base`` is used for ``pull`` in a treeless branch
   instead of failing. It's useless but harmless. (Vincent Ladeuil, #1022160)