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

devblog

Browse source
This commit is contained in:
Joey Hess 2014-06-09 20:14:52 -04:00
parent ab72456bb3
commit 03f186609f
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/devblog/day_181__tricky_merge.mdwn Normal file
View file

@ -0,0 +1,8 @@
Spent most of today improving behavior when a sync or merge is
interrupted in direct mode. It was possible for an interrupt at the wrong
time to leave the merge committed, but the work tree not yet updated. And
then the next sync would make a commit that reverted the merged changes!
To fix this I had to avoid making any merge commit or indeed updating the
index until after the work tree is updated. It looked intractable for a
while; I'm still surprised I eventually succeeded.