diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-17 15:19:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-17 15:19:47 -0400 |
| commit | ee7c5c8636e0478746b72e9900811b3a63c450cc (patch) | |
| tree | 0fc96bf1d5e01584e9fede3ea44080d76cc3b205 /CHANGELOG | |
| parent | 697bb401dbb2a9497e8e3cbc895052ad87a75c23 (diff) | |
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.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 <id@joeyh.name> Mon, 17 Oct 2016 12:46:54 -0400 |