From ee7c5c8636e0478746b72e9900811b3a63c450cc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Oct 2016 15:19:47 -0400 Subject: upgrade: Handle upgrade to v6 when the repository already contains v6 unlocked files whose content is already present. Closes https://github.com/datalad/datalad/issues/1020 The use of runWriter in scanUnlockedFiles broke due to this change; it failed with blocked indefinitely in mvar, because the database write handle was taken while linkFromAnnex needed to also write to it (to update the inode cache). So, switched to using a separate runWriter for each call to addAssociatedFileFast. A little less efficient, but not greatly; the writes should all still be cached. --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 7dd7b8d2b..db291e15a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ git-annex (6.20161013) UNRELEASED; urgency=medium * lock, smudge: Fix edge cases where data loss could occur in v6 mode when the keys database was not populated. + * upgrade: Handle upgrade to v6 when the repository already contains + v6 unlocked files whose content is already present. -- Joey Hess Mon, 17 Oct 2016 12:46:54 -0400 -- cgit v1.2.3