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

4 files changed, 111 insertions, 0 deletions

diff --git a/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_3_4026607087a9da2759f841e59aadfcdc._comment b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_3_4026607087a9da2759f841e59aadfcdc._comment
new file mode 100644
index 000000000..ae32c9788
--- /dev/null
+++ b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_3_4026607087a9da2759f841e59aadfcdc._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="nanotech"
+ subject="comment 3"
+ date="2016-03-17T08:39:36Z"
+ content="""
+I think this is the same bug as [Moved files are not picked up by the assistant on OS X](https://git-annex.branchable.com/bugs/Moved_files_are_not_picked_up_by_the_assistant_on_OS_X/). To reproduce, run the first transcript there but drop the file before moving it.
+
+FSEvents fails to produce add events for dangling symlinks (<https://github.com/facebook/watchman/issues/172>), although it does produce removal events. Recompiling and using Kqueue with git-annex instead seems to detect dangling symlinks and add them correctly.
+"""]]
diff --git a/doc/bugs/stack_build_Setup.hs_dependencies.mdwn b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
new file mode 100644
index 000000000..1e9fc431f
--- /dev/null
+++ b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
@@ -0,0 +1,56 @@
+### Please describe the problem.
+
+`stack build` on a fresh clone of git-annex at e029eb8b fails with
+
+    git-annex-6.20160229: configure
+
+    Utility/FileSystemEncoding.hs:30:18:
+        Could not find module ‘Data.Hash.MD5’
+        Use -v to see a list of the files searched for.
+
+    Utility/FileSystemEncoding.hs:32:8:
+        Could not find module ‘Data.Bits.Utils’
+        Perhaps you meant
+          Data.BitUtil
+          Data.Bits.Lens (from lens-4.13@lens_IUJoiaRWYAQ6ieqgqTJZ5D)
+        Use -v to see a list of the files searched for.
+
+    Utility/FileSystemEncoding.hs:34:8:
+        Could not find module ‘Data.List.Utils’
+        Perhaps you meant
+          Data.BitUtil
+          Data.List.Lens (from lens-4.13@lens_IUJoiaRWYAQ6ieqgqTJZ5D)
+          Data.List.Split (from split-0.2.3@split_CDzOynTh4l8Ahg1HaWUL4Z)
+        Use -v to see a list of the files searched for.
+
+    Utility/Process.hs:53:8:
+        Could not find module ‘System.Log.Logger’
+        Perhaps you meant
+          System.Log.FastLogger (from fast-logger-2.4.1@fastl_1adi3bwIxvVE3Gyx2Jy1k0)
+        Use -v to see a list of the files searched for.
+
+    Utility/SafeCommand.hs:14:8:
+        Could not find module ‘Data.String.Utils’
+        Perhaps you meant
+          Data.String.UTF8 (from utf8-string-1.0.1.1@utf8s_L8eKHa7Iv9q7FVKUYW6u4b)
+        Use -v to see a list of the files searched for.
+
+### What steps will reproduce the problem?
+
+`stack build`
+
+### What version of git-annex are you using? On what operating system?
+
+e029eb8b, OS X 10.10.5.
+
+### Please provide any additional information below.
+
+These are apparently dependencies of `Setup.hs`. Adding
+
+    explicit-setup-deps:
+      "*": true
+
+to `stack.yaml` [(as described here)](https://github.com/commercialhaskell/stack/blob/a59997d5db963bba403119843340688ee25e2c6f/doc/yaml_configuration.md#explicit-setup-deps)
+fixes the error and builds git-annex successfully.
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
diff --git a/doc/users/datalad.mdwn b/doc/users/datalad.mdwn
new file mode 100644
index 000000000..1aad07cf6
--- /dev/null
+++ b/doc/users/datalad.mdwn
@@ -0,0 +1,23 @@
+TODOs for DataLad
+=================
+
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
+(author(yoh) or author(mih))" sort=mtime feeds=no actions=yes archive=yes show=0]]
+
+Done
+----
+
+[[!inline pages="todo/* and !todo/done and link(todo/done) and
+(author(yoh) or author(mih))" feeds=no actions=yes archive=yes show=0]]
+
+My bugs
+=======
+
+[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and
+(author(yoh) or author(mih))" sort=mtime feeds=no actions=yes archive=yes show=0  template=buglist]]
+
+Fixed
+-----
+
+[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and
+(author(yoh) or author(mih))" feeds=no actions=yes archive=yes show=0  template=buglist]]
diff --git a/doc/users/mih.mdwn b/doc/users/mih.mdwn
new file mode 100644
index 000000000..1a0327a40
--- /dev/null
+++ b/doc/users/mih.mdwn
@@ -0,0 +1,23 @@
+My todos
+========
+
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
+author(mih)" sort=mtime feeds=no actions=yes archive=yes show=0]]
+
+Done
+----
+
+[[!inline pages="todo/* and !todo/done and link(todo/done) and
+author(mih)" feeds=no actions=yes archive=yes show=0]]
+
+My bugs
+=======
+
+[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and
+author(mih)" sort=mtime feeds=no actions=yes archive=yes show=0  template=buglist]]
+
+Fixed
+-----
+
+[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and
+author(mih)" feeds=no actions=yes archive=yes show=0  template=buglist]]