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

Fix direct mode merge bug when a direct mode file was deleted and replaced with a directory. An ordering problem caused the directory to not get created in this case. Thanks to Tim for the test cases.

Browse source
This commit is contained in:
Joey Hess 2013-11-15 13:40:12 -04:00
parent 0744560e4b
commit b0f85b3e22
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -27,6 +27,10 @@ git-annex (5.20131102) UNRELEASED; urgency=low
* repair: Handle case where index file is corrupt, but all objects are ok.
* assistant: Notice on startup when the index file is corrupt, and
auto-repair.
* Fix direct mode merge bug when a direct mode file was deleted and replaced
with a directory. An ordering problem caused the directory to not get
created in this case.
Thanks to Tim for the test cases.
-- Joey Hess <joeyh@debian.org> Wed, 06 Nov 2013 16:14:14 -0400