Rev 6061: Remember to update release notes when submitting these things. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-dirstate-invalid-delta-855155

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-dirstate-invalid-delta-855155

------------------------------------------------------------
revno: 6061
revision-id: john at arbash-meinel.com-20130529081102-2fxc8agnq5fd38so
parent: john at arbash-meinel.com-20130529060235-d7rpolm1tx7t55ok
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-dirstate-invalid-delta-855155
timestamp: Wed 2013-05-29 09:11:02 +0100
message:
  Remember to update release notes when submitting these things.
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-10-27 13:20:43 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2013-05-29 08:11:02 +0000
@@ -40,6 +40,10 @@
 * Fixed loading of external merge tools from config to properly decode
   command-lines which contain embedded quotes. (Gordon Tyler, #828803)
 
+* Handle when an uncommit/update tries to add a file to an otherwise empty
+  directory. The ``Dirstate.update_basis_by_delta`` would end up
+  incorrectly flagging the delta as invalid. (Brian de Alwis, #855155)
+
 * Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
   pyrex code with new Cython versions. (Denys Duchier, #837221)