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

2
doc/bugs/Incorrect_merge__44___direct_repos___40__2__41__.mdwn
View file

@ -40,3 +40,5 @@ remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
Linux ceilingcat 3.11.6-1-ARCH #1 SMP PREEMPT Fri Oct 18 23:22:36 CEST 2013 x86_64 GNU/Linux
"""]]
> [[fixed|done]] --[[Joey]]