From: Joey Hess Date: Mon, 2 Mar 2020 20:08:31 +0000 (-0400) Subject: merge X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~126^2~62 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41a5c4786008827d209c295bd3809fab5e113f2d;p=git-annex.git merge --- diff --git a/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_.mdwn b/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_.mdwn index 5b5309b9a8..2886f455f7 100644 --- a/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_.mdwn +++ b/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_.mdwn @@ -192,3 +192,7 @@ drop file1 ok [[!meta author=yoh]] [[!tag projects/datalad]] + +> merged with +> +> [[done]] --[[Joey]] diff --git a/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_/comment_3_6c79c41676318bd976eff9988463d167._comment b/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_/comment_3_6c79c41676318bd976eff9988463d167._comment new file mode 100644 index 0000000000..f4ada35c68 --- /dev/null +++ b/doc/bugs/drop_on_NFS___40__no_pidlock_need_detected__41___leaves_annex__47__objects__47__XX__47__YY__47__KEY_dir_behind_/comment_3_6c79c41676318bd976eff9988463d167._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2020-03-02T19:56:49Z" + content=""" +Sure, some minor change in git-annex could tickle non-deterministic +behavior, eg something to do with timing of when it deletes the file +vs the later closing of the file that drops the lock. + +That regression made git-annex init fail when NFS doesn't have posix lock +support enabled. It can detect that, and enables pidlock, but it can't +detect NFS when it is pretending to support posix locks. +"""]] diff --git a/doc/bugs/huge_multiple_copies_of___39__.nfs__42____39___and___39__.panfs__42____39___being_created.mdwn b/doc/bugs/huge_multiple_copies_of___39__.nfs__42____39___and___39__.panfs__42____39___being_created.mdwn index 4e62fa7583..3c5ff4d711 100644 --- a/doc/bugs/huge_multiple_copies_of___39__.nfs__42____39___and___39__.panfs__42____39___being_created.mdwn +++ b/doc/bugs/huge_multiple_copies_of___39__.nfs__42____39___and___39__.panfs__42____39___being_created.mdwn @@ -30,3 +30,5 @@ Clone a git annex repo on a network file system, run """]] [[!meta title="git-annex and NFS don't mix; could git annex init detect NFS and refuse to use it?"]] + +[[!tag projects/datalad]]