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

comment

Browse source
This commit is contained in:
Joey Hess 2019-09-30 13:53:50 -04:00
parent 9a22adf358
commit 430e33e3dd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
doc/bugs/assistant_sometimes_does_not_merge_changes_from_remote/comment_1_43bae1f11621232a9133cdef21d1f063._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2019-09-30T17:41:23Z"
content="""
It may be that git is not overwriting the file with its new content, but is
unlinking it and then writing the new content. If so, that could explain
the assistant's behavior, since it could notice the file has been deleted,
and might commit that before it notices it's been added back.
I tried stracing git checkout, and it indeed does unlink
a modified file then it opens the file for write and writes out the new
content. Kind of surprising it's not more atomic.
The nature of the assistant is that it's never going to be guaranteed to
always make commits that make logical sense in the same way that manually
committing will. It might be possible to improve this by having it delay
committing removals for some period of time.
"""]]