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

4 files changed, 158 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_stack.yml_misses_extra-deps..mdwn b/doc/bugs/git-annex_stack.yml_misses_extra-deps..mdwn
new file mode 100644
index 000000000..f476fe1de
--- /dev/null
+++ b/doc/bugs/git-annex_stack.yml_misses_extra-deps..mdwn
@@ -0,0 +1,88 @@
+### Please describe the problem.
+
+extra-deps in stack.yaml seems to miss a few packages? I am pretty new to stack, so maybe
+I am misinterpreting, but following stacks suggestion below and adding 
+
+- bloomfilter-2.0.1.0
+- network-multicast-0.2.0
+- torrent-10000.0.1
+
+to my stack.yaml lets me build the latest master branch on jessie.
+
+### What steps will reproduce the problem?
+
+Checking out the latest commit (661dae3649f10a07ba6091a9a376ae1049fed716) and running "stack setup && stack install"
+should reproduce it? See transcript below.
+
+### What version of git-annex are you using? On what operating system?
+
+6.20170101-android on Debian Jessie. Stack Version 1.3.2
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+
+$ git clone git://git-annex.branchable.com/ git-annex                                                                                                                                
+Cloning into 'git-annex'...
+remote: Counting objects: 178001, done.
+remote: Compressing objects: 100% (49612/49612), done.
+remote: Total 178001 (delta 127721), reused 178001 (delta 127721)
+Receiving objects: 100% (178001/178001), 43.14 MiB | 1.47 MiB/s, done.
+Resolving deltas: 100% (127721/127721), done.
+Checking connectivity... done.
+$ cd git-annex
+$ stack setup
+Downloaded lts-7.18 build plan.    
+Fetching package index ...remote: Counting objects: 1887, done.
+remote: Compressing objects: 100% (164/164), done.
+remote: Total 1887 (delta 676), reused 641 (delta 641), pack-reused 1079
+Receiving objects: 100% (1887/1887), 1.59 MiB | 904.00 KiB/s, done.
+Resolving deltas: 100% (757/757), completed with 311 local objects.
+From https://github.com/commercialhaskell/all-cabal-hashes
+   3ae7c75..ca0bc8e  hackage    -> origin/hackage
+ - [tag update]      current-hackage -> current-hackage
+Fetched package index.    
+Populated index cache.    
+stack will use a sandboxed GHC it installed
+For more information on paths, see 'stack path' and 'stack exec env'
+To use this GHC and packages outside of a project, consider using:
+stack ghc, stack ghci, stack runghc, or stack exec
+$ stack install
+Cabal file warning in /home/phaer/projects/external/git-annex/git-annex.cabal: Ignoring unknown section type: custom-setup
+
+Error: While constructing the build plan, the following exceptions were encountered:
+
+In the dependencies for git-annex-6.20170101(-android
+-androidsplice
++assistant
++concurrentoutput
++cryptonite
+-dbus
+-magicmime
++network-uri
++pairing
++production
++s3
++testsuite
++torrentparser
++webapp
++webdav):
+    bloomfilter must match -any, but the stack configuration has no specified version (latest applicable is 2.0.1.0)
+    network-multicast must match -any, but the stack configuration has no specified version (latest applicable is 0.2.0)
+    torrent must match (>=10000.0.0), but the stack configuration has no specified version
+            (latest applicable is 10000.0.1)
+
+Recommended action: try adding the following to your extra-deps in /home/phaer/projects/external/git-annex/stack.yaml:
+- bloomfilter-2.0.1.0
+- network-multicast-0.2.0
+- torrent-10000.0.1
+
+You may also want to try the 'stack solver' command
+Plan construction failed.
+
+"""]]
+
+### 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)
+
+Yes, I am using it since a few years to manage my videos, photos and music. Thanks so much for this outstanding piece of software!
diff --git a/doc/forum/Alternative_to_git_annex_copy_which_is_as_fast_as_git_annex_get.mdwn b/doc/forum/Alternative_to_git_annex_copy_which_is_as_fast_as_git_annex_get.mdwn
new file mode 100644
index 000000000..61d0ea699
--- /dev/null
+++ b/doc/forum/Alternative_to_git_annex_copy_which_is_as_fast_as_git_annex_get.mdwn
@@ -0,0 +1,15 @@
+I have a big git-annex repository. If I add a few files on my laptop I want to sync it with my server which consists of one bare git-annex repository (server_bare) and one regular git-annex repository (server).
+
+I run
+
+git annex sync
+git annex copy * --to server
+
+The second command is really slow since it runs git annex copy on every single file that I have locally (it sometimes takes an hour to complete). If I would instead run
+
+git annex sync
+git annex get .
+
+This is usually quite fast, but it is not so easy to do since I don't keep an SSH port open on my laptop.
+
+My question: Is there any command that I can run on my laptop which basically invokes "git annex get ." from the server?
diff --git a/doc/forum/git_annex_init_timeout.mdwn b/doc/forum/git_annex_init_timeout.mdwn
new file mode 100644
index 000000000..5bd64f943
--- /dev/null
+++ b/doc/forum/git_annex_init_timeout.mdwn
@@ -0,0 +1,43 @@
+I'm trying git-annex for the first time and having some issues.
+
+I have a WD MyBook 2TB Cloud Drive and using OSX Sierra.
+
+I want to create an Annex on one the NAS smb shares and then a Amazon Cloud Drive replica for offsite backup.
+
+When I run `git annex init` from the mounted share in OSX it fails with the below:
+
+```
+git-annex init
+init
+  Detected a filesystem without POSIX fcntl lock support.
+
+  Enabling annex.pidlock.
+
+  Detected a filesystem without fifo support.
+
+  Disabling ssh connection caching.
+
+  Detected a crippled filesystem.
+
+  Disabling core.symlinks.
+
+  Enabling direct mode.
+A300 second timeout exceeded while waiting for pid lock file .git/annex/pidlock
+```
+
+Below are the results of `git-annex version`
+
+```
+git-annex version: 6.20170101
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+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
+```
+
+
+
+Is it possible to have an annex on a SMB share?
diff --git a/doc/install/OSX/Homebrew-cask/comment_1_a2f3b109df830529235fa45a49feaeec._comment b/doc/install/OSX/Homebrew-cask/comment_1_a2f3b109df830529235fa45a49feaeec._comment
new file mode 100644
index 000000000..fba500a99
--- /dev/null
+++ b/doc/install/OSX/Homebrew-cask/comment_1_a2f3b109df830529235fa45a49feaeec._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="chocolate.camera@ec2ecab153906be21ac5f36652c33786ad0e0b60"
+ nickname="chocolate.camera"
+ avatar="http://cdn.libravatar.org/avatar/4f00dfc3ad590ef7492788b854ceba78"
+ subject="Install via brew cask not working"
+ date="2017-02-02T00:01:08Z"
+ content="""
+When trying to install via `brew cask install git-annex` on OS 10.7, returns:
+
+> Error: No available Cask for git-annex  
+> Error: nothing to install
+"""]]