update for reversion

2 files changed, 14 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index fb4b85d7d..8bbeb28f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,14 @@ git-annex (3.20130208) UNRELEASED; urgency=low
     the Makefile is made to use -DWITH_GLOB
   * New annex.crippledfilesystem setting, allows use of git-annex
     repositories on FAT and even worse filesystems; avoiding use of
-    hard links, symlinks, and locked down permissions settings.
+    hard links and locked down permissions settings.
   * init: Detect when the repository is on a filesystem that does not
     support hard links, or symlinks, or unix permissions, and set
     annex.crippledfilesystem, as well as annex.direct.
   * add: Improved detection of files that are modified while being added.
+  * Fix a bug in direct mode, introduced in the previous release, where
+    if a file was dropped and then got back, it would be stored in indirect
+    mode.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 10 Feb 2013 14:52:01 -0400
 
diff --git a/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn b/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn
index 09bfd0c3b..ec35b0696 100644
--- a/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn
+++ b/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn
@@ -56,3 +56,13 @@ What version of git-annex are you using? On what operating system?
 
 git-annex: 3.20130124
 Debian: sid 2013-02-01
+
+> I put a fix in for this in 57780cb3a4dfe1292b72e1412ec4d2a70b6d04ce 
+> but it was buggy and I had to revert it.
+> 
+> The bug is caused by direct mode cache and mapping info.
+> This makes getKeysPresent find keys that are not present.
+> It would be expensive to make getKeysPresent check that the
+> actual key files are present (it just lists the directories). 
+> But this seems to be needed, since direct mode can leave
+> cache and mapping files behind. --[[Joey]]