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

merge 2 bugs

Browse source
This commit is contained in:
Joey Hess 2015-07-07 15:09:17 -04:00
parent 1970c323c1
commit c6210902c0
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Deleted_files_during_merge.mdwn
View file

@ -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"]]

9
doc/bugs/git_annex_still_deleting_content_when_merging.mdwn
View file

@ -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"]]