Rev 5119: (vila) Fix bug numbers and delete duplicated entry. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5119 [merge]
revision-id: pqm at pqm.ubuntu.com-20100327103111-4g435d39ujhe95vp
parent: pqm at pqm.ubuntu.com-20100326105820-ijo11554jb43sgzm
parent: v.ladeuil+lp at free.fr-20100327095210-rkdykvl7guvzxxzt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2010-03-27 10:31:11 +0000
message:
  (vila) Fix bug numbers and delete duplicated entry.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2010-03-26 10:25:47 +0000
+++ b/NEWS	2010-03-27 09:52:10 +0000
@@ -142,10 +142,10 @@
 
 * DirStateRevisionTree.kind() was returning wrong result when 'kind'
   changes occured between the workingtree and one of its parents.
-  (Vincent Ladeuil, #533437)
+  (Vincent Ladeuil, #535547)
 
-* Fix stub sftp test server to call os.getcwdu().
-  (Vincent Ladeuil, #526211, #526353)
+* Fix ``log`` to better check ancestors even if merged revisions are involved.
+  (Vincent Ladeuil, #476293)
 
 * Many IO operations that returned ``EINTR`` were retried even if it
   wasn't safe to do so via careless use of ``until_no_eintr``.  Bazaar now
@@ -294,7 +294,7 @@
 * Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
 
 * Fix stub sftp test server to call os.getcwdu().
-  (Vincent Ladeuil, #526211, #526353)
+  (Vincent Ladeuil, #526221, #526353)
 
 * Fixed CHM generation by moving the NEWS section template into
   a separate file. (Ian Clatworthy, #524184)
@@ -363,9 +363,6 @@
   when it encounters conflicts.  
   (Gerard Krol, #113809)
 
-* Fix ``log`` to better check ancestors even if merged revisions are involved.
-  (Vincent Ladeuil, #476293)
-
 * Give a better error message when doing ``bzr bind`` in an already bound
   branch.  (Neil Martinsen-Burrell, #513063)