Merge branch 'master' of ssh://git-annex.branchable.com

8 files changed, 98 insertions, 0 deletions

diff --git a/doc/Android/comment_6_97704e0d89bb87155e019e09e54fc9bf._comment b/doc/Android/comment_6_97704e0d89bb87155e019e09e54fc9bf._comment
new file mode 100644
index 000000000..39c44a8fb
--- /dev/null
+++ b/doc/Android/comment_6_97704e0d89bb87155e019e09e54fc9bf._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk2BFMjJW081uX4aJdhStmSFPBUGzL92ZU"
+ nickname="Frédéric"
+ subject="where do I put the SSH keys on Android"
+ date="2014-02-26T20:26:38Z"
+ content="""
+@mebus :
+You can put your SSH keys here :
+
+/sdcard/git-annex.home/.ssh/id_rsa
+
+/sdcard/git-annex.home/.ssh/id_rsa.pub
+"""]]
diff --git a/doc/bugs/Auto-repair_greatly_slows_down_the_machine/comment_1_a52e4ef04209d0a2449165e2b4cb9ccc._comment b/doc/bugs/Auto-repair_greatly_slows_down_the_machine/comment_1_a52e4ef04209d0a2449165e2b4cb9ccc._comment
new file mode 100644
index 000000000..b50a0cfb8
--- /dev/null
+++ b/doc/bugs/Auto-repair_greatly_slows_down_the_machine/comment_1_a52e4ef04209d0a2449165e2b4cb9ccc._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.146"
+ subject="comment 1"
+ date="2014-02-26T17:38:05Z"
+ content="""
+Auto repair is not intended to be a common occurrance. It means something went badly, horribly wrong on your machine, and it lost data that git wrote to disk. It's more important in such a scenraio to get back to a working system eventually than to do something fast or inexpensively.
+
+If you're seeing the need for auto repair on a weekly basis, your computer is failing in a horrible way horribly frequently, and the thing to do is to find out why, and fix that. Perhaps you need to start cleanly shutting down the system. Perhaps something is causing your computer to crash, and you need to fix that.
+"""]]
diff --git a/doc/bugs/Creating_a_box.com_repository_fails/comment_8_109e37051beb729834e05997c023b849._comment b/doc/bugs/Creating_a_box.com_repository_fails/comment_8_109e37051beb729834e05997c023b849._comment
new file mode 100644
index 000000000..24c9153a8
--- /dev/null
+++ b/doc/bugs/Creating_a_box.com_repository_fails/comment_8_109e37051beb729834e05997c023b849._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="fmarier"
+ ip="192.81.133.89"
+ subject="Re: No working ubuntu package"
+ date="2014-02-26T02:06:24Z"
+ content="""
+I have just uploaded version 5.20140221.1 of the git-annex package in my PPA. It should re-enable DAV support.
+"""]]
diff --git a/doc/bugs/problems_with_android_and_gpg/comment_3_47510400e8e45a71a1581aed99a157a1._comment b/doc/bugs/problems_with_android_and_gpg/comment_3_47510400e8e45a71a1581aed99a157a1._comment
new file mode 100644
index 000000000..2f663d943
--- /dev/null
+++ b/doc/bugs/problems_with_android_and_gpg/comment_3_47510400e8e45a71a1581aed99a157a1._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.146"
+ subject="comment 3"
+ date="2014-02-26T18:34:18Z"
+ content="""
+AFAICS, the messages about locking are a red herring, since shared encryption is being used, the public and secret key rings are not used.
+
+This problem seems to be explained here: <http://crypto.stackexchange.com/questions/1468/how-does-gpg-verify-succesful-decryption>
+
+It seems there must be a problem with the symmetric key used for shared encryption. Either the repository somehow has the wrong key in it, or the key is not extracted from the repository correctly somehow, or it's not fed into gpg correctly somehow.
+"""]]
diff --git a/doc/bugs/problems_with_android_and_xmpp/comment_2_ae4554fadfc3ea1913a36aa535815cfb._comment b/doc/bugs/problems_with_android_and_xmpp/comment_2_ae4554fadfc3ea1913a36aa535815cfb._comment
new file mode 100644
index 000000000..48f945d85
--- /dev/null
+++ b/doc/bugs/problems_with_android_and_xmpp/comment_2_ae4554fadfc3ea1913a36aa535815cfb._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.146"
+ subject="comment 2"
+ date="2014-02-26T18:52:17Z"
+ content="""
+I don't see any indications that this problem is specific to Android.
+
+Relying on git push over XMPP is known to be somewhat fragile, and some XMPP servers are known to do things with the XMPP protcol that make it impossible to reliably do git push over it. [[design/assistant/xmpp]] discusses these problems. Since this seems a basically intractable problem to solve, git-annex will be moving away from XMPP as soon as something better is available. (eg [[design/assistant/telehash]])
+
+The best way to use XMPP currently is as a simple signaling mechanism to tell when a push has been made to a git repository. Your ssh server seems to have an encrypted rsync repository on it, so no git repository. If you can put up a git repository someplace both the android and linux machine can access, I think that you'll find it greatly improves the reliability of the syncing.
+"""]]
diff --git a/doc/forum/git_annex_with_local_apache_webdav_server.mdwn b/doc/forum/git_annex_with_local_apache_webdav_server.mdwn
new file mode 100644
index 000000000..db489fdfa
--- /dev/null
+++ b/doc/forum/git_annex_with_local_apache_webdav_server.mdwn
@@ -0,0 +1,23 @@
+Hi, 
+
+trying to make git annex work locally with an apache webdav server.
+
+I have the webdav server working without issue on computers. When we try to init the repository there we get the following error:
+
+WEBDAV_USERNAME=user WEBDAV_PASSWORD=xxxxxx git annex initremote webdavtest type=webdav url=http://webdavserver/webdavsgare/annextest4 encryption=none 
+initremote webdavtest (testing WebDAV server...)
+
+git-annex: WebDAV failed to delete file: "Locked": user error
+failed
+git-annex: initremote: 1 failed
+
+
+Does anyone have any thoughts? I can post config of webdav if it helps, though the error I receive in the error_log of apache is as follows:
+
+This resource is locked and an "If:" header was not supplied to allow access to the resource.  [423, #0]
+
+but I can manage the files through command line, web interface and mounted drive with no issue.
+
+thank you in advance.
+
+Damien
diff --git a/doc/forum/git_annex_with_local_apache_webdav_server/comment_1_a3b89f90f9ac70e0a9b0711ede1cb810._comment b/doc/forum/git_annex_with_local_apache_webdav_server/comment_1_a3b89f90f9ac70e0a9b0711ede1cb810._comment
new file mode 100644
index 000000000..7963f64f0
--- /dev/null
+++ b/doc/forum/git_annex_with_local_apache_webdav_server/comment_1_a3b89f90f9ac70e0a9b0711ede1cb810._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.146"
+ subject="comment 1"
+ date="2014-02-26T19:40:18Z"
+ content="""
+The webdav library that git-annex uses does some webdav file locking. When deleting a file, it first locks it. It sounds like your webdav server does not like to delete a file that has been locked. Whether this is in spec I don't know.
+
+I do know that got rid of all the webdav locking stuff in a revamp of git-annex's webdav support 2 days ago! git-annex does not need locking the way it uses webdav.
+
+However, the daily builds are still built with an old version of the DAV library, which still does the locking ... and will probably remain like that for some time. To get the new version without locking, you need to build git-annex from its git master on a system with http://hackage.haskell.org/package/DAV version 0.6.1. Building from source with cabal is one way to do it. I'll be releasing a build for Debian unstable in the next day or two.
+"""]]
diff --git a/doc/news/version_5.20140221/comment_1_d50bff4ee026db3397333e8ded7c5940._comment b/doc/news/version_5.20140221/comment_1_d50bff4ee026db3397333e8ded7c5940._comment
new file mode 100644
index 000000000..7b28c905f
--- /dev/null
+++ b/doc/news/version_5.20140221/comment_1_d50bff4ee026db3397333e8ded7c5940._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg"
+ nickname="Bence"
+ subject="Metadata for the win! "
+ date="2014-02-26T07:03:32Z"
+ content="""
+Awesome. Finally one can store the public url of a file which is in a special remote. Think about Google Drive: a file uploaded there can be shared from the command line if it's public url is known (and stored in metadata when uploaded). The flickr special remote could also make benefit of this: a file doesn't have to be searched to locate in flickr if the ids are stored in metadata. 
+"""]]