mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into assistant

Browse source
This commit is contained in:
Joey Hess 2012-07-05 10:34:52 -06:00
commit b7c3cc2745
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/design/assistant/syncing.mdwn
View file

@ -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! * Poll transfer in progress info files for changes (use inotify again!
wow! hammer, meet nail..), and update the TransferInfo Map **done** wow! hammer, meet nail..), and update the TransferInfo Map **done**
* enqueue Transfers (Uploads) as new files are added to the annex by * 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 * enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by
Watcher. Watcher.
* Write basic Transfer handling thread. Multiple such threads need to be * Write basic Transfer handling thread. Multiple such threads need to be
@ -88,11 +88,8 @@ anyway.
### transfer tracking ### transfer tracking
* Upload added to queue by the watcher thread when it adds content. Transfer threads started/stopped as necessary to move data.
* Download added to queue by the watcher thread when it seens new symlinks (May sometimes want multiple threads downloading, or uploading, or even both.)
that lack content.
* 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 :: TransferQueue -> Transfer -> Annex ()
startTransfer q transfer = error "TODO" startTransfer q transfer = error "TODO"

1
doc/forum/Problems_using_submodules_with_git-annex__63__.mdwn Normal file
View file

@ -0,0 +1 @@
Are there any problems using submodules with git-annex? I have not tried it yet, I'm just asking.