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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -3,11 +3,7 @@ git-annex (5.20140607) UNRELEASED; urgency=medium
* Ignore setsid failures.
* Avoid leaving behind .tmp files when failing in some cases, including
importing files to a disk that is full.
* direct mode: Avoid committing a merge until after the work tree is
updated. This avoids an interrupted merge leaving the work tree out
of sync with the last commit, which could result in the wrong thing
being committed later, and files appearing to get deleted.
(They could be recovered by reverting the bad commit.)
* Avoid bad commits after interrupted direct mode sync (or merge).
-- Joey Hess <joeyh@debian.org> Mon, 09 Jun 2014 14:44:09 -0400

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.