update

1 files changed, 14 insertions, 12 deletions

diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn
index 36561ca7f..492401b6b 100644
--- a/doc/todo/smudge.mdwn
+++ b/doc/todo/smudge.mdwn
@@ -2,11 +2,22 @@ git-annex should use smudge/clean filters.
 
 ### implementation todo list
 
-* Test suite has a currently disabled pass that tests v6 unlocked files.
-  That pass has many failures.
-* Intermittent test suite failures, with:
+* Intermittent sqlite related test suite failures, with:
 	Exception: failed to commit changes to sqlite database: Just SQLite3 returned ErrorIO while attempting to perform step.
 	sqlite worker thread crashed: SQLite3 returned ErrorError while attempting to perform step.
+
+* Dropping a smudged file causes git status (and git annex status)
+  to show it as modified,  because the timestamp has changed. 
+  Getting a smudged file can also cause this.
+  Upgrading a direct mode repo also leaves files in this state.
+  User can use `git add` to clear it up, but better to avoid this,
+  by updating stat info in the index.
+  (May need to use libgit2 to do this efficiently, cannot find
+  any plumbing except git-update-index, which is very inneficient for
+  smudged files.)
+  ** This causes some test suite failures; git merge fails when files
+  are in this state **
+
 * Reconcile staged changes into the associated files database, whenever
   the database is queried. This is needed to handle eg:
   	git add largefile
@@ -26,15 +37,6 @@ git-annex should use smudge/clean filters.
   when pushing changes committed in such a repo. Ideally, should avoid
   committing implicit unlocks, or should prevent such commits leaking out
   in pushes.
-* Dropping a smudged file causes git status (and git annex status)
-  to show it as modified,  because the timestamp has changed. 
-  Getting a smudged file can also cause this.
-  Upgrading a direct mode repo also leaves files in this state.
-  User can use `git add` to clear it up, but better to avoid this,
-  by updating stat info in the index.
-  (May need to use libgit2 to do this, cannot find
-  any plumbing except git-update-index, which is very inneficient for
-  smudged files.)
 * Optimisation: See if the database schema can be improved to speed things
   up. Are there enough indexes? getAssociatedKey in particular does a
   reverse lookup and might benefit from an index.