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

doc/bugs/brew_install_git-annex_failed.mdwn

@@ -0,0 +1,49 @@
+### Please describe the problem.
+
+brew install git-annex failed.
+
+### What steps will reproduce the problem?
+
+
+### What version of git-annex are you using? On what operating system?
+Mac OS X 10.11 El Capitan
+
+### Please provide any additional information below.
+
+[[!format sh """
+95b3d57ce7--git-annex-7.20191230.tar.gz
+==> cabal v1-sandbox init
+==> cabal v1-update
+==> cabal v1-install --jobs=4 --max-backjumps=100000 alex
+==> cabal v1-install --jobs=4 --max-backjumps=100000 happy
+==> cabal v1-install --jobs=4 --max-backjumps=100000 c2hs
+==> cabal v1-install --jobs=4 --max-backjumps=100000 --only-dependencies --constraint http-conduit>=2.3 --constraint net
+==> cabal v1-configure --flags=s3 webapp
+==> cabal v1-install --jobs=4 --max-backjumps=100000 --prefix=/usr/local/Cellar/git-annex/7.20191230 --constraint http-c
+Last 15 lines from /Users/choi/Library/Logs/Homebrew/git-annex/08.cabal:
+StandaloneDeriving
+
+Please enable the extensions by copy/pasting these lines into the top of your file:
+
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE StandaloneDeriving #-}
+   |
+31 | share [mkPersist sqlSettings, mkMigrate "migrateKeysDb"] [persistLowerCase|
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...
+cabal: Leaving directory '.'
+cabal: Error: some packages failed to install:
+git-annex-7.20191230-JGm7b2Gk5I8w0hi2BDCiw failed during the building phase.
+The exception was:
+ExitFailure 1
+
+
+Do not report this issue to Homebrew/brew or Homebrew/core!
+
+These open issues may also help:
+git-annex-remote-rclone 0.6 (new formula) https://github.com/Homebrew/homebrew-core/pull/49468
+git-annex: add OBJC_DISABLE_INITIALIZE_FORK_SAFETY environment variable https://github.com/Homebrew/homebrew-core/pull/48411
+"""]]
+
+### 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)
+
+

doc/contribute.mdwn

@@ -69,6 +69,6 @@ As Haskell programs go, git-annex does not use too many advanced features.
 [Learn You A Haskell](http://learnyouahaskell.com/) will teach you enough
 to get started.
 
-Of course git-annex does use monads, and particularly the `Annex``monad
+Of course git-annex does use monads, and particularly the `Annex` monad
 which gives access to its state about the git repository as well as
 lower-level IO.

doc/scalability.mdwn

@@ -37,3 +37,5 @@ git-annex is designed for scalability. The key points are:
   becomes increasingly expensive. Consider adjusting the `annex.queuesize`
   to a higher value, at the expense of it using more memory.
 
+* See also: [[tips/Repositories_with_large_number_of_files]]
+

doc/tips/Repositories_with_large_number_of_files/comment_7_f56f1ffeb5e1f382d3227b4ace7f84a1._comment

@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="breck7@4bbace32c18ebb98fc730d56c6ed76b7bcc0798e"
+ nickname="breck7"
+ avatar="http://cdn.libravatar.org/avatar/96a1ef57fee8349bd6f92faf153f9ec3"
+ subject="Thank you"
+ date="2020-01-30T15:15:24Z"
+ content="""
+I just ran into related git scaling issues while trying to make a repo in a folder with 6.5 million files. [Writeup](https://breckyunits.com/building-a-treebase-with-6-point-5-million-files.html). I did things the naive/wrong way on purpose, but now I'm curious if I could actually get this work fast, and your pointers are a good help. Thanks!
+"""]]

doc/todo/setpresentkey_option_to_record_chunked_state/comment_2_42e9309fff6a71c1a0a625dd2bc6aae2._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="Ilya_Shlyakhter"
+ avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
+ subject="use case to record chunked state"
+ date="2020-01-29T17:48:40Z"
+ content="""
+\"What is the use case?\" -- to register with git-annex the presence of a file in a remote, that is already split into chunks, without downloading the file.
+\"I would rather not complicate setpresentkey with things not related to presence information\" -- makes sense.
+\"you may as well just write data to the branch yourself\" -- yes; just wasn't sure if that might break some invariant, e.g. between the branch and the SQL databases derived from it.
+
+Don't worry about this todo, I'll figure it out.
+"""]]