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

finish fixing direct mode merge bug involving unstaged local files

Browse source 
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.

Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.

Still need to run test suite on windows.
This commit is contained in:
Joey Hess 2014-03-04 01:58:09 -04:00
parent 19475fd0ab
commit 4a847cdc08
4 changed files with 92 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn
View file

@ -10,3 +10,5 @@ is not checked into git, the merge will overwrite it with the remote file from g
New problem: If the merge pulls in a directory, and a file exists with
the name of the directory, locally, not annexed, the file is left alone,
but the directory is thus not checked out, and will be deleted on commit.
> [[fixed|done]]; regression test in place. --[[Joey]]