summaryrefslogtreecommitdiff
path: root/t/t3903-stash.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2010-07-09 07:10:53 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-09 16:12:42 -0700
commit37348937ff391f01981e8af10b2f615268fd2509 (patch)
treecf7f9b6eeb2d8057a483e31255ab0497e5c5bb4d /t/t3903-stash.sh
parentAdd a rename + D/F conflict testcase (diff)
downloadtgif-37348937ff391f01981e8af10b2f615268fd2509.tar.xz
merge-recursive: Fix D/F conflicts
The D/F conflicts that can be automatically resolved (file or directory unmodified on one side of history), have the nice property that process_entry() can correctly handle all subpaths of the D/F conflict. In the case of D->F conversions, it will correctly delete all non-conflicting files below the relevant directory and the directory itself (note that both untracked and conflicting files below the directory will prevent its removal). So if we handle D/F conflicts after all other conflicts, they become fairly simple to handle -- we just need to check for whether or not a path (file/directory) is in the way of creating the new content. We do this by having process_entry() defer handling such entries to a subsequent process_df_entry() step. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3903-stash.sh')
0 files changed, 0 insertions, 0 deletions