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

update

Browse source
This commit is contained in:
Joey Hess 2011-12-11 16:19:54 -04:00
parent cfbbda99f4
commit 0236bb020b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/bugs/git-annex_branch_corruption.mdwn
View file

@ -36,11 +36,14 @@ fixed.
Probably git-annex needs to record which ref of the git-annex branch
corresponds to its index, and if the branch is at a different ref,
merge it into the index. I am still considering how to do that atomically;
what if a push comes in while git-annex is updating its index?
merge it into the index.
> Now git-annex always updates the index with the git-annex branch, which
> is a slow, but safe way to avoid this problem. [[done]] --[[Joey]]
> And now that's [[done]]. I managed to do it with very little slowdown.
>
> A side benefit is that users can now safely check out the git-annex
> branch and commit changes to it, and git-annex will notice them.
> Before, it was documented to ignore such changes.
> --[[Joey]]
---