From 7fd9fa3d72d547e8b5735d2b6bbce23b3136bdba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Dec 2015 17:47:49 -0400 Subject: [PATCH] update --- doc/todo/smudge.mdwn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 4c9f4acf67..0d2f30e079 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -2,8 +2,12 @@ git-annex should use smudge/clean filters. ### implementation todo list -* Still a few test suite failues for v6 with locked files. -* Test suite should make pass for v6 with unlocked files. +* Test suite: + Next "needs to be done" is to work on the test suite some more for v6 + repositories. Need to add a test for how it resolves a conflict between + an unlocked and a locked file that point to the same key. Need to add + another pass through all the tests with files being unlocked. And need to + fix the two remaining test failures. * Reconcile staged changes into the associated files database, whenever the database is queried. This is needed to handle eg: git add largefile