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

2 files changed, 32 insertions, 1 deletions

diff --git a/doc/bugs/git-annex___38___rsync_can__39__t_copy_files_with___39__:__39___in_their_names.mdwn b/doc/bugs/git-annex___38___rsync_can__39__t_copy_files_with___39__:__39___in_their_names.mdwn
new file mode 100644
index 000000000..bdf72d0d5
--- /dev/null
+++ b/doc/bugs/git-annex___38___rsync_can__39__t_copy_files_with___39__:__39___in_their_names.mdwn
@@ -0,0 +1,31 @@
+What steps will reproduce the problem?
+
+Send a file with the character ':' in it. rsync fails to send those files from the command line as well
+confusing them with hostnames. As far as I know a workaround is prepending the pathname with './'
+(for rsync commandline invocation that is)
+
+What is the expected output? What do you see instead?
+
+    copy müzik/Mixxx/Recordings/2013-01-15_16h:13m:03s.mp3 (checking kaotik...) (to kaotik...) 
+    git-annex: //home/alip/kaotika/.git/annex/transfer/download/effe4eef-926f-494c-a3b6-eeecdc208fb9/SHA256-s36349200--ce51eaf316b19c61831
+    41f0bda1c54be7e590e5999753a4b1c16bafab93a3fc1: commitBuffer: invalid argument (invalid character)
+    git-annex-shell: recvkey: 1 failed
+    protocol version mismatch -- is your shell clean?
+    (see the rsync man page for an explanation)
+    rsync error: protocol incompatibility (code 2) at compat.c(174) [sender=3.0.9]
+
+
+What version of git-annex are you using? On what operating system?
+
+    git-annex version: 3.20120807
+    local repository version: 3
+    default repository version: 3
+    supported repository versions: 3
+    upgrade supported from repository versions: 0 1 2
+
+Operating system is Linux (Exherbo) although this isn't a packaged installation.
+I installed it by hand from git sources.
+
+Please provide any additional information below.
+
+Thanks for the wonderful tool!
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 88f63b1a3..a92a88a14 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!" 16 "I need a Windows port" 28 "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" 3 "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?" 5 "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." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?"]]
+[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 16 "I need a Windows port" 28 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 2 "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." 21 "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" 3 "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?" 5 "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." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?"]]
 
 Feel free to write in your own reasons, or add a comment to give me more info.