Rev 6061: Add news entry fixing the wrongly sorted ones in passing. in file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/

------------------------------------------------------------
revno: 6061
revision-id: v.ladeuil+lp at free.fr-20111026171715-xe215ynskzwymyxb
parent: v.ladeuil+lp at free.fr-20111026165818-1nc3t9spcxogzb7c
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 880701-resolve-duplicate
timestamp: Wed 2011-10-26 19:17:15 +0200
message:
  Add news entry fixing the wrongly sorted ones in passing.
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-08-24 09:34:35 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-10-26 17:17:15 +0000
@@ -32,9 +32,18 @@
 Bug Fixes
 *********
 
+* Fixed an infinite loop when creating a repo at the root of the filesystem, 
+  i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into 
+  one, thus respecting the POSIX standard, but making relpath() loop infinitely.
+  (Florian Vichot, #861008)
+
 * Fixed loading of external merge tools from config to properly decode
   command-lines which contain embedded quotes. (Gordon Tyler, #828803)
 
+* 'Duplicate' conflicts are now created instead of 'Content' ones when a
+  merge tries to create two entries for the same path.
+  (Vincent Ladeuil, #880701)
+
 * Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
   pyrex code with new Cython versions. (Denys Duchier, #837221)
 
@@ -46,11 +55,6 @@
   avoids raising a spurious MemoryError on certain platforms such as AIX.
   (John Arbash Meinel, #856731)
   
-* Fixed an infinite loop when creating a repo at the root of the filesystem, 
-  i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into 
-  one, thus respecting the POSIX standard, but making relpath() loop infinitely.
-  (Florian Vichot, #861008)
-
 Documentation
 *************