Re: [PATCH 0/3] Fix resolvable rename + D/F conflict testcases
From: Elijah Newren <hidden>
Date: 2016-06-15 22:49:30
On Mon, Sep 6, 2010 at 2:47 PM, Elijah Newren [off-list ref] wrote:
This fixes an issue reported by Nick, as well as a closely related issue in the handling of rename + directory/file conflicts, particularly where a file on one side of the rename is a directory name on the other side of the merge.
I forgot to mention; this patch series is based on next, since it touches some of the code from ks/recursive-rename-add-identical.
Elijah Newren (3): t3509: Add rename + D/F conflict testcases that recursive strategy fails merge-recursive: Small code cleanup merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir merge-recursive.c | 50 ++++++++++++++++------------- t/t3509-cherry-pick-merge-df.sh | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 22 deletions(-)