Code

merge-recursive: Make room for directories in D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:09 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:05 +0000 (17:37 -0700)
commitef02b317212443036be6007bba3a1a5946460dc9
tree43158534be95efba683618d518b1bcc96c7ac016
parent84a08a47b9559e76df96645c536845f31ba4dc7b
merge-recursive: Make room for directories in D/F conflicts

When there are unmerged entries present, make sure to check for D/F
conflicts first and remove any files present in HEAD that would be in the
way of creating files below the correspondingly named directory.  Such
files will be processed again at the end of the merge in
process_df_entry(); at that time we will be able to tell if we need to
and can reinstate the file, whether we need to place its contents in a
different file due to the directory still being present, etc.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6020-merge-df.sh