diff options
author | 2014-03-04 01:58:09 -0400 | |
---|---|---|
committer | 2014-03-04 02:03:15 -0400 | |
commit | cfe87407f493e428ca8e1d5592b228675199afb3 (patch) | |
tree | 260e68fab396ba20c515a31a7ad8a88e2bcf3aeb /doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | |
parent | 0ba6b3aa7d3a7528ba95ffbae7df6634adbed9b6 (diff) |
finish fixing direct mode merge bug involving unstaged local files
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.
Diffstat (limited to 'doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn')
-rw-r--r-- | doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn index 4b5a9d2a3..081dd414b 100644 --- a/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn +++ b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn @@ -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]] |