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 5b5309b9a88e92110bf42ab517099c613b59fde4..2886f455f7a14434afba3994ed23f3ed0d571df6 100644 (file)
--- 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
+> <https://git-annex.branchable.com/bugs/huge_multiple_copies_of___39__.nfs__42____39___and___39__.panfs__42____39___being_created/>
+> [[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 (file)
index 0000000..f4ada35
--- /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 4e62fa75836bbdb42048d47f61d4b1e4a6ae3e3e..3c5ff4d7112a25d1d35319543ed0e2139d5f1525 100644 (file)
--- 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]]