diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-16 16:13:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-16 16:13:09 -0400 |
| commit | a58b4611211154ba6cd6f07c2914e89b2d036845 (patch) | |
| tree | 60dee278a5bbcefbedfd024fa64e734f6a750833 /doc | |
| parent | 965c9e7389b9357e0d7f95aa53a5d232c854e862 (diff) | |
| parent | a564603bd1a8f4bb69c72ebcf2a2bd772863508f (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
2 files changed, 24 insertions, 0 deletions
diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_2_02a2b69adbb04b557146e713b70b34d2._comment b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_2_02a2b69adbb04b557146e713b70b34d2._comment new file mode 100644 index 000000000..7df35b33d --- /dev/null +++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_2_02a2b69adbb04b557146e713b70b34d2._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="64.134.31.139" + subject="comment 2" + date="2013-10-16T18:04:27Z" + content=""" +I can confirm this bug, thanks for a good reproduction recipe. + +However, there is no actual data loss. If you switch to repo to indirect mode, you can use `git checkout` to check out the past versions from before the botched merge. When you do, you'll find that the files that the merge seemingly deleted in fact still have their contents present. It is preserved in `.git/annex/objects` by the automatic merge conflict resolution code, which does that whenever it deletes a file, whether for good reasons or for buggy reasons. + +So if you feel you lost data due to this, you can almost certainly get it back and I'm happy to help with that. + + +"""]] diff --git a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment b/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment new file mode 100644 index 000000000..eaf42c9e2 --- /dev/null +++ b/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="64.134.31.139" + subject="comment 2" + date="2013-10-16T16:57:02Z" + content=""" +This was fixed. + +(Please file bug reports for bugs in the future, so they don't clutter up this forum once fixed.) +"""]] |