mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

prospective fix for bad_merge_commit_deleting_all_files

Browse source 
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
This commit is contained in:
Joey Hess 2014-07-09 15:07:53 -04:00
parent 4915f9ad03
commit 58acaf8026
4 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/bad_merge_commit_deleting_all_files.mdwn
View file

@ -27,9 +27,11 @@ redo, passing `-m 2` instead.)
Once the revert is done, all your files should be back. You can switch
the repository back to direct mode if desired (`git annex direct`)
and can `git annex sync` to push the fix out to all other clones.
Everywhere the fix lands should restore the deleted files. (Although
it's possible that some repositories may have pruned the deleted
files as unused.)
Everywhere the fix lands should restore the deleted files.
Note that it's possible that some repositories may have pruned the deleted
files as unused. This is most likely to happen in the repository that made
the bad merge commit in the first place.
[[!tag confirmed urgent]]