From 530c1b092a8658c8dab4261cd6a0de3a40cbfc6c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs" Date: Thu, 5 Jul 2012 08:04:54 +0000 Subject: [PATCH 1/2] --- doc/forum/Problems_using_submodules_with_git-annex__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Problems_using_submodules_with_git-annex__63__.mdwn diff --git a/doc/forum/Problems_using_submodules_with_git-annex__63__.mdwn b/doc/forum/Problems_using_submodules_with_git-annex__63__.mdwn new file mode 100644 index 0000000000..39ebe855c1 --- /dev/null +++ b/doc/forum/Problems_using_submodules_with_git-annex__63__.mdwn @@ -0,0 +1 @@ +Are there any problems using submodules with git-annex? I have not tried it yet, I'm just asking. From c1728849a9b5d1e7803cf6a36f826a7bafdc667a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jul 2012 10:34:47 -0600 Subject: [PATCH 2/2] update --- doc/design/assistant/syncing.mdwn | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn index d2248279f7..caae60a32e 100644 --- a/doc/design/assistant/syncing.mdwn +++ b/doc/design/assistant/syncing.mdwn @@ -16,7 +16,7 @@ all the other git clones, at both the git level and the key/value level. * Poll transfer in progress info files for changes (use inotify again! wow! hammer, meet nail..), and update the TransferInfo Map **done** * enqueue Transfers (Uploads) as new files are added to the annex by - Watcher. + Watcher. **done** * enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by Watcher. * Write basic Transfer handling thread. Multiple such threads need to be @@ -82,11 +82,8 @@ anyway. ### transfer tracking -* Upload added to queue by the watcher thread when it adds content. -* Download added to queue by the watcher thread when it seens new symlinks - that lack content. -* Transfer threads started/stopped as necessary to move data. - (May sometimes want multiple threads downloading, or uploading, or even both.) +Transfer threads started/stopped as necessary to move data. +(May sometimes want multiple threads downloading, or uploading, or even both.) startTransfer :: TransferQueue -> Transfer -> Annex () startTransfer q transfer = error "TODO"