Clarify

diff --git a/doc/todo/Incremental_git_annex_sync_--content_--all.mdwn b/doc/todo/Incremental_git_annex_sync_--content_--all.mdwn
index fd59035e710797fa63c3371ac280db5ef43f2d82..59e615b69ca0374a36ea15912a2565e69b3df0ae 100644 (file)
--- a/doc/todo/Incremental_git_annex_sync_--content_--all.mdwn
+++ b/doc/todo/Incremental_git_annex_sync_--content_--all.mdwn
@@ -1,15 +1,18 @@
 Hi,<br>
 So I have yet another idea to speed up git annex. For now only for the 2nd pass of git annex sync --content --all.
 
-1. Do a normal (full) git annex sync. For every remote that we synced with, record the commit id of the current tip of the git-annex branch.
-    * Record the commit id only if --content --all was specified
-    * Record the commit id only if the remote is actually available and every file was sucessfully transfered
-2. If any of the remotes doesn't have a commit id recorded, go to 1. Else do a incremental git annex sync: In the 2nd pass of git annex sync --content --all,
-   only look at keys whose location log changed since the last (full or incremental) sync via `git diff-tree -r --name-only <lowest recorded commit id of all remotes> git-annex`.
-   Again, update the commit id of remotes that we sucessfully synced with.
-3. If one of the following happens, remove all recorded commit ids of all remotes, go to 1. Else go to 2.
-    * The preferred content expression of us or one of our remotes changed.
-    * The preferred content expression of a group changed
-    * The group of any repo (not only remotes) changed. This way remotes containing `copies=<group>:<numcopies>` recheck all keys.
-
-This should be pretty reliable, but please double check. It has to be reliable enough to become the default.      
+1. Check which remotes are currently available (i.e. online and connected).
+2. If any of the (available) remotes doesn't have a commit recorded (See below), do a full sync.
+3. If numcopies.log, mincopies.log, trust.log, group.log, preferred-content.log, required-content.log, group-preferred-content.log or transitions.log (on the git-annex branch) changed since the last time we synced, do a full sync (since if any of those logs changed, it may affect the preferred-content expressions and we need to reevaluate every key).
+4. If every check passed, do an incremental sync.
+
+##Full sync:
+
+1. Do a normal (full) git annex sync.
+2. For every remote that we synced with, record the commit id of the current tip of the git-annex branch.
+    * Record the commit id only if every file was successfully transferred/dropped.
+
+##Incremental sync:
+
+1. In the 2nd pass of git annex sync --content --all, only look at keys whose location log changed since the last (full or incremental) sync via `git diff-tree -r --name-only <lowest recorded commit id of all remotes> git-annex`.
+2. Again, update the commit id of remotes that we successfully synced with.