summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn5
-rw-r--r--doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn3
-rw-r--r--doc/preferred_content.mdwn9
3 files changed, 8 insertions, 9 deletions
diff --git a/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn b/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn
index 278eb1e0f..de88b0246 100644
--- a/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn
+++ b/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn
@@ -22,3 +22,8 @@ Running 3.20130102 on OSX
## Please provide any additional information below.
+> More specifically, git annex direct fails, on OSX only, when there are two
+> files that both have the same content. Apparently OSX doesn't allow
+> hard linking two symbolic links together. There was no harm in it doing that
+> otherwise, but then again no reason for it to do so, so I've put in a fix.
+> [[done]] --[[Joey]]
diff --git a/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn b/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn
index 5377d07f2..b7ecdebbf 100644
--- a/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn
+++ b/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn
@@ -21,3 +21,6 @@ git-annex version 3.20130102 on Xubuntu 12.04, installed with cabal (got no erro
Please provide any additional information below.
I do not know if there is any log, or any info about the reason of the failure. Something useful could be that ~/annex/ now contains an empty git repository, so "something" happened despite the error.
+
+> Made assistant detect misconfigured system and set enough environment
+> variables so git will work. [[done]] --[[Joey]]
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index 6408656e4..6538bcc80 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -58,15 +58,6 @@ content be dropped only when there are currently 3 copies of it, including
the repo it's being dropped from. This is different than running `git annex
drop --copies=2`, which will drop files that current have 2 copies.
-A wrinkle of this approach is how `in=` is handled. When deciding if
-content should be dropped, git-annex looks at the current status, not
-the status if the content would be dropped. So `in=here` means that
-any currently present content is preferred, which can be useful if you
-want manual control over content. Meanwhile `not (in=here)` should be
-avoided -- it will cause content that's not here to be preferred,
-but once the content arrives, it'll stop being preferred and will be
-dropped again!
-
## difference: "present"
There's a special "present" keyword you can use in a preferred content