diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-07 15:09:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-07 15:12:03 -0400 |
| commit | f47173db2615adc07296858b9959de785bbe852b (patch) | |
| tree | fd7e32ba523ae8cd3ddd8dc4b9bc9f0200bf033d | |
| parent | fa80c89746ca7ffe590d8f40c13e46cea8423b55 (diff) | |
merge 2 bugs
| -rw-r--r-- | doc/bugs/Deleted_files_during_merge.mdwn | 8 | ||||
| -rw-r--r-- | doc/bugs/git_annex_still_deleting_content_when_merging.mdwn | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/bugs/Deleted_files_during_merge.mdwn b/doc/bugs/Deleted_files_during_merge.mdwn index 8786a1e63..63ef1de7d 100644 --- a/doc/bugs/Deleted_files_during_merge.mdwn +++ b/doc/bugs/Deleted_files_during_merge.mdwn @@ -2128,3 +2128,11 @@ rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] # End of transcript or log. """]] + +> This seems very like the problem described in +> [[git_annex_still_deleting_content_when_merging]]. Without a way to +> reproduce it, I can't tell for sure, but the circumstances of both seem +> the same. I'm going to close this as a duplicate, and have updated the +> other bug report to point to it as more evidence of the bug. [[done]] + +[[!meta title="Assistant deleted modified file during merge"]] diff --git a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn index dddef7b36..872b699c0 100644 --- a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn +++ b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn @@ -86,3 +86,12 @@ From ssh://git-annex-asus.local-USER-A_22_sincro/~/sincro # End of transcript or log. """]] + +> [[Deleted_files_during_merge]] seems like much the same problem. +> In both that bug report and this one, the file that gets deleted on B was +> earlier modifed on A. There is a small difference, in that in this bug +> report, A made 2 commits, first deleting the file and then adding back a +> new version. In the other bug report, A made just 1 commit, changing the +> file. --[[Joey]] + +[[!meta title="Assistant deleted file when merging"]] |