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

3 files changed, 57 insertions, 0 deletions

diff --git a/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_4_45c1e00e64f916ef8a5f9200144861eb._comment b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_4_45c1e00e64f916ef8a5f9200144861eb._comment
new file mode 100644
index 000000000..4d33e5057
--- /dev/null
+++ b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_4_45c1e00e64f916ef8a5f9200144861eb._comment
@@ -0,0 +1,37 @@
+[[!comment format=mdwn
+ username="olaf"
+ avatar="http://cdn.libravatar.org/avatar/4ae498d3d6ee558d6b65caa658f72572"
+ subject="comment 4"
+ date="2017-06-22T04:50:13Z"
+ content="""
+I can confirm this is still a problem.
+
+## OS:
+macOS Sierra, version 10.12.5 (16F73)
+
+## git-annex versions:
+
+### OSX DMG install
+```
+Version: 6.20170611-gb493ac8
+Build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents ConcurrentOutput TorrentParser MagicMime Feeds Quvi Dependency versions: aws-0.16 bloomfilter-2.0.1.0 cryptonite-0.21 DAV-1.3.1 feed-0.3.12.0 ghc-8.0.2 http-client-0.5.6.1 persistent-sqlite-2.6.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.4.5
+```
+
+### Homebrew install
+```
+git-annex version: 6.20170521
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+dependency versions: aws-0.16 bloomfilter-2.0.1.0 cryptonite-0.23 DAV-1.3.1 feed-0.3.12.0 ghc-8.0.2 http-client-0.5.7.0 persistent-sqlite-2.6.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.4.5
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 5
+supported repository versions: 3 5 6
+upgrade supported from repository versions: 0 1 2 3 4 5
+operating system: darwin x86_64
+```
+
+
+## Question
+
+@nanotech - can you elaborate on your recompile with Kqueue comment above?
+"""]]
diff --git a/doc/bugs/sync_claims_data_loss_but_seems_to_just_lose_tracking/comment_4_a6074b68754b0d773385a1e406043952._comment b/doc/bugs/sync_claims_data_loss_but_seems_to_just_lose_tracking/comment_4_a6074b68754b0d773385a1e406043952._comment
new file mode 100644
index 000000000..9eb06cf99
--- /dev/null
+++ b/doc/bugs/sync_claims_data_loss_but_seems_to_just_lose_tracking/comment_4_a6074b68754b0d773385a1e406043952._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="olaf"
+ avatar="http://cdn.libravatar.org/avatar/4ae498d3d6ee558d6b65caa658f72572"
+ subject="comment 4"
+ date="2017-06-22T04:55:35Z"
+ content="""
+So, you're suggesting manually running `git annex sync --content`?  I can `cron` that up, so I can live with it.
+
+Do you need any more info to identify the issue you found with the assistant?
+"""]]
diff --git a/doc/forum/git-repair_doesn__39__t_build_with_GHC_8.0.2.mdwn b/doc/forum/git-repair_doesn__39__t_build_with_GHC_8.0.2.mdwn
new file mode 100644
index 000000000..bd6ae58fd
--- /dev/null
+++ b/doc/forum/git-repair_doesn__39__t_build_with_GHC_8.0.2.mdwn
@@ -0,0 +1,10 @@
+This should be related to directory 1.3.
+
+    Common.hs:3:16: error:
+        Conflicting exports for ‘getFileSize’:
+           ‘module X’ exports ‘X.getFileSize’
+             imported from ‘Utility.FileSize’ at Common.hs:32:1-28
+             (and originally defined at Utility/FileSize.hs:26:1-11)
+           ‘module X’ exports ‘X.getFileSize’
+             imported from ‘Utility.Directory’ at Common.hs:33:1-29
+             (and originally defined in ‘System.Directory’)