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

3 files changed, 59 insertions, 1 deletions

diff --git a/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_2_41214a7d18c66b694645248d6ebeadbf._comment b/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_2_41214a7d18c66b694645248d6ebeadbf._comment
new file mode 100644
index 000000000..ea9518cb6
--- /dev/null
+++ b/doc/bugs/fsck_should_double-check_when_a_content-check_fails/comment_2_41214a7d18c66b694645248d6ebeadbf._comment
@@ -0,0 +1,25 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkHDm_DOFRcHYebCnnYKKyIwiPD4iOiiIU"
+ nickname="Jörn"
+ subject="comment 2"
+ date="2013-01-14T17:37:45Z"
+ content="""
+Maybe I was too quick in blaming the hard drive. It might be my problem is somewhere else. Let me do what I should have done in the first place and give you a detailed problem description:
+
+I have got three hard drives, two internal, one external connected via USB. I have got a couple of repositories with small files (mp3, JPEGs and so on). Those are fine, fsck never complains about them. 
+But in one repository with video files (i.e. much bigger files than in the other repos), git-annex fsck will always find some broken files. I run git-annex get to retrieve the broken files from other sources. Then I run
+fsck again - and it complains about some other files. This happens on all drives.
+
+This could mean:
+
+- all my drives are broken. However, SMART data are unsuspicious, and one of the drives is just a couple of days old.
+- git-annex fsck is broken
+- read errors like I mentioned in my first post
+- some process actually _altering_ the files (should not happen when the files are locked, right?)
+- something completely different? Some possibly dangerous source of radiation? :)
+
+Any ideas on this? Maybe I should hash the data in .git/annex/bad and check which value I get - can I tell git-annex to do so?
+
+Thanks,
+Jörn
+"""]]
diff --git a/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_3_063f5e5e554ad6710f16394906d87616._comment b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_3_063f5e5e554ad6710f16394906d87616._comment
new file mode 100644
index 000000000..fd129a468
--- /dev/null
+++ b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_3_063f5e5e554ad6710f16394906d87616._comment
@@ -0,0 +1,33 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.7.238"
+ subject="comment 3"
+ date="2013-01-14T17:40:51Z"
+ content="""
+`git annex sync` cannot sync xmpp remotes. Only the assistant can do that. So that's a red herring indeed..
+
+I've replicated the same setup with 3 repositories all paired using a single jabber account.
+In my test, all 3 stay in sync, with any change to one git repository being synced to the other 2.
+
+I checked the XMPP sync protocol, and it doesn't use the UUIDs at all for XMPP syncing, so the fact that `.git/config` only has the UUID of one of the two repositories that is accessible via XMPP in this case, should not matter. That is, though, why the webapp only shows one of the other two repositories; it's using that UUID information.
+
+Dagon seems to be where the problem is occuring; it's not managing to sync out its changes via XMPP.
+I think the thing to do is create another new file on dagon, and look at its `.git/annex/daemon.log`.
+You should see two xmpp pushes happen, which would look rather like this:
+
+<pre>
+To xmpp::you@gmail.com
+   a7549be..011ccc2  git-annex -> refs/synced/9346f5a8-5e63-11e2-bd8b-77356d7f5bd0/git-annex
+   3acca89..5123067  master -> refs/synced/9346f5a8-5e63-11e2-bd8b-77356d7f5bd0/master
+Counting objects: 12, done.
+Delta compression using up to 2 threads.
+Compressing objects: 100% (6/6), done.
+Writing objects: 100% (7/7), 622 bytes, done.
+Total 7 (delta 3), reused 0 (delta 0)
+To xmpp::you@gmail.com
+   a7549be..011ccc2  git-annex -> refs/synced/9346f5a8-5e63-11e2-bd8b-77356d7f5bd0/git-annex
+   3acca89..5123067  master -> refs/synced/9346f5a8-5e63-11e2-bd8b-77356d7f5bd0/master
+</pre>
+
+If you don't see both pushes, maybe you'll see a useful error message.
+"""]]
diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
index ba3e97a6a..88e7256d7 100644
--- a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
+++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
@@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
 adept friends or family -- what's preventing you from introducing them to
 the assistant?
 
-[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 15 "I need a Windows port" 26 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 10 "I want to, but have not had the time to try it" 4 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 20 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit."]]
+[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 15 "I need a Windows port" 26 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 20 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit."]]
 
 Feel free to write in your own reasons, or add a comment to give me more info.