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 2016-06-13 16:18:13 -04:00
parent 6b3dd76b02
commit 1e4e6f4737
Failed to extract signature
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
doc/devblog/day_399__weird_git_merge_bug.mdwn Normal file
View file

@ -0,0 +1,16 @@
There was one more test suite failure when run on FAT, which I've
investigated today. It turns out that
[a bug report](https://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/)
was filed about the same problem, and at root
it seems to be a [bug in git merge](http://thread.gmane.org/gmane.comp.version-control.git/297237).
Luckily, it was not hard to work around the strange merge behavior.
It's been very worthwhile running the test suite on FAT; it's pointed me at
several problems with adjusted branches over the past weeks. It would be
good to add another test suite pass to test adjusted branches explicitly,
but when I tried adding that, there were a lot of failures where the test
suite is confused by adjusted branch behavior and would need to be taught
about it.
I've released git-annex 6.20160613. If you're using v6 repositories and
especially adjusted branches, you should upgrade since it has many fixes.