Rev 6079: Merge release notes update for previous branch, as it was meant to land. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-fdatasync-ENOTSUP-1075108

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-fdatasync-ENOTSUP-1075108

------------------------------------------------------------
revno: 6079 [merge]
revision-id: john at arbash-meinel.com-20130523083009-9mw2908d0vrbetr5
parent: john at arbash-meinel.com-20130523082934-tsue2gvl57q31w9z
parent: john at arbash-meinel.com-20130523075954-hgz4j73hrarbxnxn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-fdatasync-ENOTSUP-1075108
timestamp: Thu 2013-05-23 09:30:09 +0100
message:
  Merge release notes update for previous branch, as it was meant to land.
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2013-05-23 08:29:34 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2013-05-23 08:30:09 +0000
@@ -35,6 +35,10 @@
 * Cope with Unix filesystems, such as smbfs, where chmod gives 'permission
   denied'.  (Martin Pool, #606537)
 
+* 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)
+
 * When the ``limbo`` or ``pending-deletion`` directories exist, typically
   because of an interrupted tree update, but are empty, bzr no longer
   errors out, because there is nothing for the user to clean up.  Also,