diff options
author | 2014-03-16 16:08:49 -0400 | |
---|---|---|
committer | 2014-03-16 16:08:49 -0400 | |
commit | 70053e602d6e94b6b6630eda624fe332cff494b3 (patch) | |
tree | f43b3996a3f37bab23a6d36677b349b88d0d940d /doc | |
parent | a6785f80eb6d007c24e8995b6418849b5f8abe90 (diff) | |
parent | 9d4e3d0c451c1cef7eff768239e559130e57cdf8 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
4 files changed, 47 insertions, 1 deletions
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_6_770c4f1802fc40d76bbaf7783bb3b4ac._comment b/doc/assistant/remote_sharing_walkthrough/comment_6_770c4f1802fc40d76bbaf7783bb3b4ac._comment new file mode 100644 index 000000000..69ae139b2 --- /dev/null +++ b/doc/assistant/remote_sharing_walkthrough/comment_6_770c4f1802fc40d76bbaf7783bb3b4ac._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="severo" + ip="88.182.182.135" + subject="git-assistant and transfer repository" + date="2014-03-16T17:05:43Z" + content=""" +In your comment http://git-annex.branchable.com/assistant/remote_sharing_walkthrough/#comment-f97efe1d05c0101232684b4e4edc4866, you describe a way to synchronize two devices using an intermediate USB drive configured as a \"transfer repository\". + +I understand that in that case, the USB drive can only be used as a \"transmitter\", in a git repository form, not as a copy of the files structure. This means the files contained by the USB drive cannot be accessed without git/git-annnex. + +Is there a way to use the USB drive as a \"client repository\" in order to allow synchronization, as described earlier, but also as a simple copy of the files, in order to access them from any device (opening them with windows in a cyber coffee for example). + +Thanks +"""]] diff --git a/doc/bugs/map_error_after_forget/comment_4_39327211f3fd1f9ed196a1f09cf68bdc._comment b/doc/bugs/map_error_after_forget/comment_4_39327211f3fd1f9ed196a1f09cf68bdc._comment new file mode 100644 index 000000000..2795a9962 --- /dev/null +++ b/doc/bugs/map_error_after_forget/comment_4_39327211f3fd1f9ed196a1f09cf68bdc._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY" + nickname="Eric" + subject="comment 4" + date="2014-03-16T04:52:19Z" + content=""" +i don't have any ssh remotes yet. these are all local. so if it is one of the remotes, then what do i do to get it un-choked? +"""]] diff --git a/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_2_3fe298ebb3ff04d12f2528aa982d7084._comment b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_2_3fe298ebb3ff04d12f2528aa982d7084._comment new file mode 100644 index 000000000..ed5733d04 --- /dev/null +++ b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_2_3fe298ebb3ff04d12f2528aa982d7084._comment @@ -0,0 +1,24 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo" + nickname="donkeyicydragon" + subject="Problem still occurs but maybe my update did not work" + date="2014-03-16T18:01:24Z" + content=""" +Hi Joey, thanks for the quick response. + +I tried to update and retry my \"git annex unused\" but it gave the same error. Maybe my updating did not work (see below). But is there a way I can retry it without running \"git annex unused\" again? The problem is that each run takes several hours with my amount of files. +It would be nice, if git annex recognized some error in the last approach and recovered. +The tmp files that are created by \"git annex unused\" are still in .git/annex/. + + +Regarding the updating: +I tried to obtain the autobuild version but on this website I could not find a link to download the latest autobuild. I could only find the build reports. But I used the git annex installer script from https://github.com/zerodogg/scriptbucket/blob/master/gitannex-install +and it apparently knows the location of the daily build. Is this the autobuild or is git annex autobuilt more often? + +This is my version after installing it yesterday evening approx. 2h hours after your answer to the bug description. + +git-annex version: 5.20140314-g48e0f18 +build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash +key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL +remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external +"""]] diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index 0e5ade06a..c6c753259 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 63 "/sdcard/annex" 6 "Whole /sdcard" 5 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 65 "/sdcard/annex" 6 "Whole /sdcard" 6 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] |