diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files.mdwn | 11 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 817c31612..c5fdcd600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,16 @@ -git-annex (5.20140708) UNRELEASED; urgency=medium +git-annex (5.20140709) unstable; urgency=medium - * Fix git version that supported --no-gpg-sign. - * Fix bug in automatic merge conflict resolution, when one side is an - annexed symlink, and the other side is a non-annexed symlink. * Fix race in direct mode merge code that could cause all files in the repository to be removed. It should be able to recover repositories experiencing this bug without data loss. See: http://git-annex.branchable.com/bugs/bad_merge_commit_deleting_all_files/ + * Fix git version that supported --no-gpg-sign. + * Fix bug in automatic merge conflict resolution, when one side is an + annexed symlink, and the other side is a non-annexed symlink. * Really fix bug that caused the assistant to make many unncessary empty merge commits. - -- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400 + -- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 15:28:03 -0400 git-annex (5.20140707) unstable; urgency=medium diff --git a/doc/bugs/bad_merge_commit_deleting_all_files.mdwn b/doc/bugs/bad_merge_commit_deleting_all_files.mdwn index 6cfb27002..4e9e39cb4 100644 --- a/doc/bugs/bad_merge_commit_deleting_all_files.mdwn +++ b/doc/bugs/bad_merge_commit_deleting_all_files.mdwn @@ -2,9 +2,18 @@ In our family repository, we had an event where git-annex committed a bad merge commit. This had the effect of seeming to delete all the files in the repository. However, it is completely recoverable with no file loss. -Another user has reported apparently the same problem. +Other users have reported apparently the same problem. --[[Joey]] +> This appears to be a race, and I have put in a fix for that. +> It will be released in git-annex 5.20140709. +> +> It's a little bit difficult to say for sure that the bug is fixed, since +> I don't have a good way to reproduce it. However, everything I am seeing +> is consistent with my analysis, at least as far as the people who +> reported this happening with versions 5.20140613-5.20140707. +> Calling this [[done]]. --[[Joey]] + ## recovery Look through the git log for the bad commit. It will be the one diff --git a/git-annex.cabal b/git-annex.cabal index 8e1de9353..942fb37bb 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140707 +Version: 5.20140709 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> |