aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs/direct_mode_merge_interrupt.mdwn
Commit message (Collapse)AuthorAge
* correct spelling mistakesGravatar Edward Betts2017-02-12
|
* tag bugs that will be fixed when direct mode is removedGravatar Joey Hess2016-02-19
|
* work around a bug in gitGravatar Joey Hess2014-06-12
| | | | | | | | | | | http://marc.info/?l=git&m=140262402204212&w=2 This git bug manifested on FAT and Windows as the test suite failing in 3 places. All involved merge conflict resolution. It turned out that the associated file mappings were getting messed up, and that happened because this git bug lost track of what files were supposed to be symlinks. This commit was sponsored by Eric Kidd.
* avoid bad commits after interrupted direct mode sync (or merge)Gravatar Joey Hess2014-06-09
| | | | | | | | | | | | | | | It was possible for a interrupted sync or merge in direct mode to leave the work tree out of sync with the last recorded commit. This would result in the next commit seeing files missing from the work tree, and committing their removal. Now, a direct mode merge happens not only in a throwaway work tree, but using a temporary index file, and without any commits or index changes being made until the real work tree has been updated. If the merge is interrupted, the work tree may have some updated files, but worst case a commit will redundantly commit changes that come from the merge. This commit was sponsored by Tony Cantor.
* harderGravatar Joey Hess2014-06-09
|
* bugGravatar Joey Hess2014-06-09