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

6 files changed, 98 insertions, 0 deletions

diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment b/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment
new file mode 100644
index 000000000..0ec137081
--- /dev/null
+++ b/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="Marco"
+ subject="How to debug?"
+ date="2015-07-25T18:10:08Z"
+ content="""
+I want to give the two assistants one more try with the newest version.
+
+But I want the assistant not to try a repair once a failure is detected. I want to check the state of the repository to get a clue what goes wrong.
+As I understood the code there is no configuration to prevent the repair. Am I wrong? If not I could try to introduce one if it makes sense.
+"""]]
diff --git a/doc/bugs/rsync_remote_with_-J2_fails.mdwn b/doc/bugs/rsync_remote_with_-J2_fails.mdwn
new file mode 100644
index 000000000..93b317694
--- /dev/null
+++ b/doc/bugs/rsync_remote_with_-J2_fails.mdwn
@@ -0,0 +1,55 @@
+### Please describe the problem.
+
+Trying to `git annex copy` to an rsync special remote with the -J flag fails with a lot of errors. (And is slow without it).
+
+### What steps will reproduce the problem?
+
+$ git annex copy --to rsync-remote -J2
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150710-g8fd7052 on Ubuntu.
+
+### Please provide any additional information below.
+
+[[!format sh """
+$ git annex copy --to freenas-rsync -J2
+E: file has vanished: "/media/depot/annex/.git/annex/tmp/rsynctmp/29637/caa/2d1/SHA256E-s4244--4ec1ea09c7605a589a9bf6cd927e96737c512d17d8053cbfaf0dcd364702400c.txt/SHA256E-s4244--4ec1ea09c7605a589a9bf6cd927e96737c512d17d8053cbfaf0dcd364702400c.txt"
+E: rsync warning: some files vanished before they could be transferred (code 24) at main.c(1183) [sender=3.1.1]
+E: rsync: change_dir "/media/depot/annex//.git/annex/tmp/rsynctmp/29637" failed: No such file or directory (2)
+E: rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1183) [sender=3.1.1]
+  .git/annex/tmp/rsynctmp/29637/c17: removeDirectory: does not exist (No such file or directory)
+  .git/annex/tmp/rsynctmp/29637: getDirectoryContents: does not exist (No such file or directory)
+  .git/annex/tmp/rsynctmp/29637/67e: removeLink: does not exist (No such file or directory)
+  .git/annex/tmp/rsynctmp/29637: getDirectoryContents: does not exist (No such file or directory)
+  .git/annex/tmp/rsynctmp/29637: getDirectoryContents: does not exist (No such file or directory)
+  .git/annex/tmp/rsynctmp/29637/49e/833: removeLink: inappropriate type (Is a directory)
+^C
+
+J1 hangs a long time:
+$ git annex copy --to freenas-rsync -J1
+^C
+
+Works without J flag:
+$ git annex copy --to freenas-rsync 
+copy GarageBand/._.DS_Store (checking freenas-rsync...) ok
+copy GarageBand/._My Song.band (checking freenas-rsync...) ok
+copy GarageBand/._code monkey.band (checking freenas-rsync...) ok
+copy GarageBand/._first of may.band (checking freenas-rsync...) ok
+
+Version:
+$ git annex version
+git-annex version: 5.20150710-g8fd7052
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E MD5E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 5
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+
+Repo config:
+[remote "freenas-rsync"]
+	annex-rsyncurl = freenas:/mnt/tank/home/jnewsome/annex-rsync-backend
+	annex-uuid = f05581cc-7236-41ed-9db8-49424f863307
+
+"""]]
diff --git a/doc/bugs/s3_InternalIOException__63__/comment_5_134d1d0ad9f59a2b7498d1ed335cf91a._comment b/doc/bugs/s3_InternalIOException__63__/comment_5_134d1d0ad9f59a2b7498d1ed335cf91a._comment
new file mode 100644
index 000000000..59f6c1bd0
--- /dev/null
+++ b/doc/bugs/s3_InternalIOException__63__/comment_5_134d1d0ad9f59a2b7498d1ed335cf91a._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="anarcat"
+ subject="comment 5"
+ date="2015-07-23T19:44:10Z"
+ content="""
+any update of this?
+
+i still can't upload those files, while *other* files get uploaded to S3 fine. really strange. how can i reset the state of this?
+"""]]
diff --git a/doc/forum/Exclude_specific_files_from_a_special_remote/comment_2_671790686bd4724aadcadd8d8aad2c98._comment b/doc/forum/Exclude_specific_files_from_a_special_remote/comment_2_671790686bd4724aadcadd8d8aad2c98._comment
new file mode 100644
index 000000000..8ad63b91b
--- /dev/null
+++ b/doc/forum/Exclude_specific_files_from_a_special_remote/comment_2_671790686bd4724aadcadd8d8aad2c98._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="Oliv5@43a03b767570a41ba84b9e5c72f3c9816adb22e2"
+ nickname="Oliv5"
+ subject="comment 2"
+ date="2015-07-23T19:07:58Z"
+ content="""
+Yes, this is exactly what I need. It works well indeed. Thks. I didnt understand how this worked before.
+"""]]
diff --git a/doc/forum/Windows_-_You_don__39__t_have_access/comment_6_7656eb72bb9e39db59092557c57a2489._comment b/doc/forum/Windows_-_You_don__39__t_have_access/comment_6_7656eb72bb9e39db59092557c57a2489._comment
new file mode 100644
index 000000000..c78501a87
--- /dev/null
+++ b/doc/forum/Windows_-_You_don__39__t_have_access/comment_6_7656eb72bb9e39db59092557c57a2489._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="fusionx86@2cab672ef75a8502e153ceb90177dde38985dba9"
+ nickname="fusionx86"
+ subject="comment 6"
+ date="2015-07-24T18:10:20Z"
+ content="""
+Any other ideas on this problem? I was planning to use annex for large/binary files, but we have a lot of developers that would need to run it on Windows as well and I'm not sure how to roll it out when I can't get it working myself on a Windows build server. I think I saw somewhere that you have tested it on WinXP. Any chance you could download an evaluation copy of a later version (Win7/8.1/2008R2/2012R2) and try again? Annex is a great tool and would like to incorporate it into our SCM and deployment workflow if possible. Thanks.
+"""]]
diff --git a/doc/forum/git-annex_does_not_protect_files_on_NTFS-Fuse.mdwn b/doc/forum/git-annex_does_not_protect_files_on_NTFS-Fuse.mdwn
new file mode 100644
index 000000000..e8084f6ff
--- /dev/null
+++ b/doc/forum/git-annex_does_not_protect_files_on_NTFS-Fuse.mdwn
@@ -0,0 +1,8 @@
+I've read that git-annex probes the host filesystem to determine whether it has the necessary features for an indirect annex. Indirect annexes are supposed to protect annexed files from accidental editing:
+
+    # echo oops > my_cool_big_file
+    bash: my_cool_big_file: Permission denied
+
+I have an NTFS drive to share files between my Windows and Linux systems (dual boot). On Linux fuse sets the file permissions to rwx for the user and nothing for the rest, and this cannot be changed. Files in the annex can be modified as in the above example.
+
+If git-annex detects whether a fs can handle indirect annexes or not, I suggest checking for this case if possible.