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

6 files changed, 59 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_8_b1f8142039ebf1f55afe80205bc68804._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_8_b1f8142039ebf1f55afe80205bc68804._comment
new file mode 100644
index 000000000..ad2d32830
--- /dev/null
+++ b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_8_b1f8142039ebf1f55afe80205bc68804._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077"
+ nickname="j_k_234"
+ subject="comment 8"
+ date="2016-05-03T07:22:52Z"
+ content="""
+Thanks very much, that fixes it!
+
+I did have to use the stack `explicit-setup-deps` tweak to rebuild.
+"""]]
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_9_6328cbc42f5938a766ff5adda3da03b7._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_9_6328cbc42f5938a766ff5adda3da03b7._comment
new file mode 100644
index 000000000..e301c63b6
--- /dev/null
+++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_9_6328cbc42f5938a766ff5adda3da03b7._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ subject="comment 9"
+ date="2016-05-02T19:26:47Z"
+ content="""
+I appreciate that Joey has closed this as insufficiently detailed, and I'm not able to reliably reproduce the issue either, but I have experienced a similar issue today where a sync wants to delete all of the files in my repository and I have no reason to believe that I actually deleted them all.  The common factor here is that we're all trying to sync to FAT devices.  Git is very slow on FAT flash drives, and perhaps at some point it thinks the files aren't there during a sync.  I'm going to stop using git annex with FAT flash drives.
+"""]]
diff --git a/doc/design/external_special_remote_protocol/comment_25_56f38d934125c28172b6475bdb4de284._comment b/doc/design/external_special_remote_protocol/comment_25_56f38d934125c28172b6475bdb4de284._comment
new file mode 100644
index 000000000..132c95f5b
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_25_56f38d934125c28172b6475bdb4de284._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
+ nickname="grawity"
+ subject="comment 25"
+ date="2016-05-03T06:25:02Z"
+ content="""
+Is there a reason that DIRHASH in type=external uses a different format (mixed-case) from that used by type=directory (lower-case)? Or, could there be e.g. `DIRHASH LOWER` to select between the formats?
+
+I'm writing an external remote for SMB filesystem access and I'd like its storage to be usable via type=directory in case of emergencies or other reasons, but  with different dirhash layouts that's not going to work, I assume...
+"""]]
diff --git a/doc/forum/Android__58___Cabal_hell/comment_4_da004cee7c0cf5617291dbd520af2e96._comment b/doc/forum/Android__58___Cabal_hell/comment_4_da004cee7c0cf5617291dbd520af2e96._comment
new file mode 100644
index 000000000..043ed6d55
--- /dev/null
+++ b/doc/forum/Android__58___Cabal_hell/comment_4_da004cee7c0cf5617291dbd520af2e96._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425"
+ nickname="freewheelinfranks"
+ subject="Here's a link to the image files"
+ date="2016-05-03T06:14:40Z"
+ content="""
+The file \"icons.zip\" can replace the icons folder in the git-annex repo. The folder to be replaced is found at standalone/android/icons.
+
+[https://stanford.edu/~farhank/icons.zip](https://stanford.edu/~farhank/icons.zip)
+"""]]
diff --git a/doc/special_remotes/comment_33_317c4d5edc9de8159c3b03a3e161e257._comment b/doc/special_remotes/comment_33_317c4d5edc9de8159c3b03a3e161e257._comment
new file mode 100644
index 000000000..ccf879f29
--- /dev/null
+++ b/doc/special_remotes/comment_33_317c4d5edc9de8159c3b03a3e161e257._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
+ nickname="grawity"
+ subject="comment 33"
+ date="2016-05-02T18:41:53Z"
+ content="""
+I'm trying to write a remote (for smb:// support via GNOME's Gvfs), and I can't seem to find a way to change an existing special remote's parameters?
+
+Even when marked as \"dead\" (the closest to deleting a remote that I could find), it still blocks subsequent `annex initremote` calls with the same name.
+
+Also, ideally I'd want to reuse the same name _and_ keep the same UUID (e.g. when the backend is moved/renamed). Though of course there are situations where a new UUID would be wanted as well... (I guess that could depend on whether the remote is currently \"dead\" or not?)
+"""]]
diff --git a/doc/special_remotes/comment_34_31256dd4b74d344aa49902adec4bcf02._comment b/doc/special_remotes/comment_34_31256dd4b74d344aa49902adec4bcf02._comment
new file mode 100644
index 000000000..f241f3d31
--- /dev/null
+++ b/doc/special_remotes/comment_34_31256dd4b74d344aa49902adec4bcf02._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f"
+ nickname="grawity"
+ subject="comment 34"
+ date="2016-05-02T18:43:33Z"
+ content="""
+Hmm, I just found that `annex enableremote` accepts parameters to be modified; that should work for now.
+
+Though I still wonder about situations where one wants to add a new empty remote with new UUID, but reuse the old name...
+"""]]