On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren <newren@xxxxxxxxx> wrote:
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> ---
> t/t6043-merge-rename-directories.sh | 125 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 125 insertions(+)
>
> diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh
> index b737b0a105..00811f512a 100755
> --- a/t/t6043-merge-rename-directories.sh
> +++ b/t/t6043-merge-rename-directories.sh
> @@ -388,4 +388,129 @@ test_expect_failure '1f-check: Split a directory into two other directories' '
> # in section 2, plus testcases 3a and 4a.
> ###########################################################################
>
> +
> +###########################################################################
> +# SECTION 2: Split into multiple directories, with equal number of paths
> +#
> +# Explore the splitting-a-directory rules a bit; what happens in the
> +# edge cases?
> +#
> +# Note that there is a closely related case of a directory not being
> +# split on either side of history, but being renamed differently on
> +# each side. See testcase 8e for that.
> +###########################################################################
> +
> +# Testcase 2a, Directory split into two on one side, with equal numbers of paths
> +# Commit A: z/{b,c}
> +# Commit B: y/b, w/c
> +# Commit C: z/{b,c,d}
> +# Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict
> + test_i18ngrep "CONFLICT.*directory rename split" out
> +# Testcase 2b, Directory split into two on one side, with equal numbers of paths
> +# Commit A: z/{b,c}
> +# Commit B: y/b, w/c
> +# Commit C: z/{b,c}, x/d
> +# Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict
This makes sense.
> +
> +###########################################################################
> +# Rules suggested by section 2:
> +#
> +# None; the rule was already covered in section 1. These testcases are
> +# here just to make sure the conflict resolution and necessary warning
> +# messages are handled correctly.
> +###########################################################################
okay, then I'll go back to 1. and discuss "the number of files as a
hint where to rename it to" there
