diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:07:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:08:19 -0400 |
| commit | 79de0bb85e576b20117ce867ed76aab74815098d (patch) | |
| tree | 1610a43fd5cc605aa0b537e67341ac73536b3742 /doc/bugs/bad_merge_commit_deleting_all_files.mdwn | |
| parent | 32a2bf7d2050f8d639e41645069d745f7b7d56a3 (diff) | |
prospective fix for bad_merge_commit_deleting_all_files
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
Diffstat (limited to 'doc/bugs/bad_merge_commit_deleting_all_files.mdwn')
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files.mdwn | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files.mdwn b/doc/bugs/bad_merge_commit_deleting_all_files.mdwn index efcc39553..6cfb27002 100644 --- a/doc/bugs/bad_merge_commit_deleting_all_files.mdwn +++ b/doc/bugs/bad_merge_commit_deleting_all_files.mdwn @@ -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]] |