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

Windows: Fix bug in direct mode merge code that could cause files in subdirectories to go missing.

Browse source
This commit is contained in:
Joey Hess 2013-12-31 16:39:11 -04:00
parent 341b72fd9a
commit 49aad120b9
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn
View file

@ -1164,3 +1164,12 @@ git annex sync
cd ..
dir repo r1 r2
"""]]
> Yet another wonderful case of \\ vs / confusion. [[fixed|done]].
>
> That sucked, but I am rather stunned that the rest of the test
> suite passes for you. That's a lot better that it's ever done on windows
> before. Sadly I don't have as much luck on XP, still 9 failing tests
> there.
>
> --[[Joey]]