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-02 15:45:20 -04:00
commit 3ea708e03b
19 changed files with 205 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,8 +7,7 @@ all the other git clones, at both the git level and the key/value level.
**done**
* locking for the files, so redundant transfer races can be detected,
and failed transfers noticed **done**
* transfer info for git-annex-shell (problem: how to add a switch
with the necessary info w/o breaking backwards compatability?)
* transfer info for git-annex-shell **done**
* update files as transfers proceed. See [[progressbars]]
(updating for downloads is easy; for uploads is hard)
* add Transfer queue TChan

8
doc/git-annex-shell.mdwn
View file

@ -61,6 +61,14 @@ to git-annex-shell are:
git-annex uses this to specify the UUID of the repository it was expecting
git-annex-shell to access, as a sanity check.
* -- fields=val fields=val.. --
Additional fields may be specified this way, to retain compatability with
past versions of git-annex-shell (that ignore these, but would choke
on new dashed options).
Currently used fields include remoteuuid= and associatedfile=
# HOOK
After content is received or dropped from the repository by git-annex-shell,

4
doc/install/Fedora.mdwn
View file

@ -15,4 +15,6 @@ cabal install --bindir=$HOME/bin
Note: You can't just use `cabal install git-annex`, because Fedora does
not yet ship ghc 7.4.
[Status of getting a Fedora package](https://bugzilla.redhat.com/show_bug.cgi?id=662259)
* [Status of getting a Fedora package](https://bugzilla.redhat.com/show_bug.cgi?id=662259)a
* [Koji build for F17](http://koji.fedoraproject.org/koji/buildinfo?buildID=328654)
* [Koji build for F16](http://koji.fedoraproject.org/koji/buildinfo?buildID=328656)