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

13 files changed, 165 insertions, 1 deletions

diff --git a/doc/Android/comment_28_c91db1215f529aa68bfb0576c3c5eddc._comment b/doc/Android/comment_28_c91db1215f529aa68bfb0576c3c5eddc._comment
new file mode 100644
index 000000000..cf315c0d9
--- /dev/null
+++ b/doc/Android/comment_28_c91db1215f529aa68bfb0576c3c5eddc._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="Jonathan"
+ ip="63.131.117.194"
+ subject="link busybox: Read-only file system"
+ date="2013-07-29T20:08:12Z"
+ content="""
+Phone: HTC EVO 3d 4g
+Model Number: pg86100
+Android Version: 4.0.3
+"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_1_e0187b0a926904b363065ab0f850f0b2._comment b/doc/assistant/remote_sharing_walkthrough/comment_1_e0187b0a926904b363065ab0f850f0b2._comment
new file mode 100644
index 000000000..cac5295a7
--- /dev/null
+++ b/doc/assistant/remote_sharing_walkthrough/comment_1_e0187b0a926904b363065ab0f850f0b2._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmG4rlD9k1ezNkYZ8jDbITrycUmHV-P8Qs"
+ nickname="Jeroen"
+ subject="Synced vs. unsynced"
+ date="2013-07-29T18:07:45Z"
+ content="""
+I've noticed that it is also possible to add an existing annex folder on a remote server without using syncing. Are there any dangers in doing this?
+
+Could you explain what syncing does and when it is needed? Thanks.
+"""]]
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment b/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment
new file mode 100644
index 000000000..87da8dc31
--- /dev/null
+++ b/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~subito"
+ nickname="subito"
+ subject="Same here for SSH remotes"
+ date="2013-07-29T19:05:55Z"
+ content="""
+I get the problem while only adding an SSH remote. After deciding I want a git-repo on my server, it says \"Unknown UUID\" and created a remote with no name. I was unable to add any SSH remote (tried with two different servers and a couple different dirs - some completly unknown to my annex)
+
+I used the Android webapp btw - latest Version. The same version works fine on my Debian maschines.
+"""]]
diff --git a/doc/bugs/__96__git_annex_import__96___clobbers_mtime.mdwn b/doc/bugs/__96__git_annex_import__96___clobbers_mtime.mdwn
new file mode 100644
index 000000000..ce1c67fee
--- /dev/null
+++ b/doc/bugs/__96__git_annex_import__96___clobbers_mtime.mdwn
@@ -0,0 +1,60 @@
+### Please describe the problem.
+
+mtimes are clobbered with what I think is the time of the first time `git annex` saw a file in that directory on all files which are `git annex import`ed.
+
+
+### What steps will reproduce the problem?
+
+    richih@eudyptes (git)-[master] ~/killme/target % date; stat ../source/*; date; git annex import ../source/*; date; stat *; date
+    Tue Jul 30 01:41:43 CEST 2013
+      File: ‘../source/foo’
+      Size: 0           Blocks: 0          IO Block: 4096   regular empty file
+    Device: 804h/2052d  Inode: 110095      Links: 1
+    Access: (0644/-rw-r--r--)  Uid: ( 1000/  richih)   Gid: ( 1000/  richih)
+    Access: 2013-07-30 01:41:03.860703428 +0200
+    Modify: 2013-07-30 01:41:03.860703428 +0200
+    Change: 2013-07-30 01:41:03.860703428 +0200
+     Birth: -
+      File: ‘../source/foobar’
+      Size: 0           Blocks: 0          IO Block: 4096   regular empty file
+    Device: 804h/2052d  Inode: 110104      Links: 1
+    Access: (0644/-rw-r--r--)  Uid: ( 1000/  richih)   Gid: ( 1000/  richih)
+    Access: 2013-07-30 01:41:05.512703349 +0200
+    Modify: 2013-07-30 01:41:05.512703349 +0200
+    Change: 2013-07-30 01:41:05.512703349 +0200
+     Birth: -
+    Tue Jul 30 01:41:43 CEST 2013
+    import foo (checksum...) ok
+    import foobar (checksum...) ok
+    (Recording state in git...)
+    Tue Jul 30 01:41:43 CEST 2013
+      File: ‘foo’ -> ‘.git/annex/objects/pX/ZJ/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855’
+      Size: 178         Blocks: 8          IO Block: 4096   symbolic link
+    Device: 804h/2052d  Inode: 268638577   Links: 1
+    Access: (0777/lrwxrwxrwx)  Uid: ( 1000/  richih)   Gid: ( 1000/  richih)
+    Access: 2013-07-30 01:41:43.704701516 +0200
+    Modify: 2013-07-30 01:19:41.000000000 +0200
+    Change: 2013-07-30 01:41:43.700701516 +0200
+     Birth: -
+      File: ‘foobar’ -> ‘.git/annex/objects/pX/ZJ/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855’
+      Size: 178         Blocks: 8          IO Block: 4096   symbolic link
+    Device: 804h/2052d  Inode: 268774374   Links: 1
+    Access: (0777/lrwxrwxrwx)  Uid: ( 1000/  richih)   Gid: ( 1000/  richih)
+    Access: 2013-07-30 01:41:43.704701516 +0200
+    Modify: 2013-07-30 01:19:41.000000000 +0200
+    Change: 2013-07-30 01:41:43.700701516 +0200
+     Birth: -
+    Tue Jul 30 01:41:43 CEST 2013
+    richih@eudyptes (git)-[master] ~/killme/target %
+
+
+### What version of git-annex are you using? On what operating system?
+
+    git-annex version: 4.20130709
+    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
+    local repository version: 3
+    default repository version: 3
+    supported repository versions: 3 4
+    upgrade supported from repository versions: 0 1 2
+
+Debian unstable amd64
diff --git a/doc/bugs/__96__git_annex_import__96___clobbers_mtime/comment_1_d173f2903faf4bff115a0be02c146ce9._comment b/doc/bugs/__96__git_annex_import__96___clobbers_mtime/comment_1_d173f2903faf4bff115a0be02c146ce9._comment
new file mode 100644
index 000000000..acb266abe
--- /dev/null
+++ b/doc/bugs/__96__git_annex_import__96___clobbers_mtime/comment_1_d173f2903faf4bff115a0be02c146ce9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 1"
+ date="2013-07-29T23:49:12Z"
+ content="""
+PS: Maybe adding tests that _all_ commands leave mtime in place would be an option? As it is, I keep (for some value of) finding places where mtimes are clobbered.
+"""]]
diff --git a/doc/bugs/assistant_ignore_.gitignore/comment_1_3458b1342cb2e3ccc01eeedc7f0e48fc._comment b/doc/bugs/assistant_ignore_.gitignore/comment_1_3458b1342cb2e3ccc01eeedc7f0e48fc._comment
new file mode 100644
index 000000000..83cb22ccc
--- /dev/null
+++ b/doc/bugs/assistant_ignore_.gitignore/comment_1_3458b1342cb2e3ccc01eeedc7f0e48fc._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="Johannes"
+ ip="153.109.130.54"
+ subject="comment 1"
+ date="2013-07-30T11:34:15Z"
+ content="""
+Any news on this or this or any other way to exclude unwanted files? (e.g. all the temporary files created by latex)
+"""]]
diff --git a/doc/bugs/git-annex_broken_on_Android_4.3.mdwn b/doc/bugs/git-annex_broken_on_Android_4.3.mdwn
new file mode 100644
index 000000000..da1f7fd28
--- /dev/null
+++ b/doc/bugs/git-annex_broken_on_Android_4.3.mdwn
@@ -0,0 +1,3 @@
+As per [[install/Android/#comment-e218073735d67691a2c3f66cc53ca6ac]] and [[install/Android/#comment-29bd13ab9cb830ffcd7850b84fb111c8]] :
+
+git-annex is broken on Android 4.3; both on Nexus 4 and Nexus 7.
diff --git a/doc/bugs/git_annex_add_eats_files_when_filename_is_too_long/comment_5_4fb04f646de591640f8504c0caf61acd._comment b/doc/bugs/git_annex_add_eats_files_when_filename_is_too_long/comment_5_4fb04f646de591640f8504c0caf61acd._comment
new file mode 100644
index 000000000..3ece2646f
--- /dev/null
+++ b/doc/bugs/git_annex_add_eats_files_when_filename_is_too_long/comment_5_4fb04f646de591640f8504c0caf61acd._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="ckeen"
+ ip="79.249.110.228"
+ subject="Maybe related to this bug?"
+ date="2013-07-30T14:50:35Z"
+ content="""
+I have noticed similar behaviour with the importfeed command: [[tips/downloading_podcasts/#comment-3e448e43830be7e6dbe59fff6bc81e75]]
+
+After the import fails, the symlinks are created and subsequent get command return with no ouput and error code 0.
+
+Or is this a different bug?
+"""]]
diff --git a/doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment b/doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment
new file mode 100644
index 000000000..61c1a916b
--- /dev/null
+++ b/doc/install/Android/comment_7_c6dc23d0e6f4138c4bf8e3452755676f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 7"
+ date="2013-07-30T15:02:51Z"
+ content="""
+@Tony @justjohn: I created a proper bug for this: [[bugs/git-annex_broken_on_Android_4.3]]
+"""]]
diff --git a/doc/install/Fedora/comment_1_c4db84e672ad4b45b522db735706b00f._comment b/doc/install/Fedora/comment_1_c4db84e672ad4b45b522db735706b00f._comment
new file mode 100644
index 000000000..bdc8c9e06
--- /dev/null
+++ b/doc/install/Fedora/comment_1_c4db84e672ad4b45b522db735706b00f._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://mebus.myopenid.com/"
+ ip="2a01:198:3eb:0:4a5b:39ff:fea4:55b3"
+ subject="RPM of version 4.2"
+ date="2013-07-30T01:09:54Z"
+ content="""
+Hi!
+
+Isn't there an rpm package of version 4.2 available for Fedora 17 or 18?
+
+Thanks!
+
+Mebus
+
+
+"""]]
diff --git a/doc/install/cabal.mdwn b/doc/install/cabal.mdwn
index 383978d36..6c5c0d4c6 100644
--- a/doc/install/cabal.mdwn
+++ b/doc/install/cabal.mdwn
@@ -1,6 +1,11 @@
 As a haskell package, git-annex can be installed using cabal.
 
-Start by installing the [Haskell Platform](http://hackage.haskell.org/platform/).
+Start by installing the [Haskell Platform][]. In Debian, this is as
+simple as:
+
+    sudo apt-get install haskell-platform
+
+ [Haskell Platform]: http://hackage.haskell.org/platform/
 
 ## minimal build
 
diff --git a/doc/tips/downloading_podcasts/comment_1_f04bc32a34baeeffcd691e9f7cce0230._comment b/doc/tips/downloading_podcasts/comment_1_f04bc32a34baeeffcd691e9f7cce0230._comment
new file mode 100644
index 000000000..014fe3f50
--- /dev/null
+++ b/doc/tips/downloading_podcasts/comment_1_f04bc32a34baeeffcd691e9f7cce0230._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="ckeen"
+ ip="79.249.110.228"
+ subject="Filename too long"
+ date="2013-07-30T14:39:44Z"
+ content="""
+It seems that some of my feeds get stored into keys that generate a too long filename:
+
+    podcasts/.git/annex/tmp/b1f_325_URL-s143660317--http&c%%feedproxy.google.com%~r%mixotic%~5%urTIRWQK2OQ%Mixotic__258__-__Michael__Miller__-__Galactic__Technolgies.mp3.log.web:
+    openBinaryFile: invalid argument (File name too long)
+
+Is there a way to work around this?
+"""]]
diff --git a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes.mdwn b/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes.mdwn
new file mode 100644
index 000000000..f38e41dd3
--- /dev/null
+++ b/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes.mdwn
@@ -0,0 +1 @@
+It would be nice to have mimetype support on the `annex.largefiles` configuration directive. F.e. `git config annex.largefiles "not mimetype=text/plain"`