Re: [PATCH 1/3] t6423: add tests of dual directory rename plus add/add conflict

From: Calvin Wan <calvinwan@google.com>
Date: Jun 27, 2022, 22:30 UTC
Message-ID: <20220627223017.2852209-1-calvinwan@google.com>
In-Reply-To: <69d6204184363e491acb68f744ded0991be63a47.1655871652.git.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 12 quoted lines

> +# Testcase 12l, Both sides rename a directory into the other side, both add
> +#   a file with after directory renames are the same filename
> +#   Commit O: sub1/file,                 sub2/other
> +#   Commit A: sub3/file,                 sub2/{other, new_add_add_file_1}
> +#   Commit B: sub1/{file, newfile}, sub1/sub2/{other, new_add_add_file_2}
> +#
> +#   In words:
> +#     A: sub1/ -> sub3/, add sub2/new_add_add_file_1
> +#     B: sub2/ -> sub1/sub2, add sub1/newfile, add sub1/sub2/new_add_add_file_2
> +#
> +#   Expected: sub3/{file, newfile, sub2/other}
> +#             CONFLICT (add/add): sub3/sub2/new_add_add_file

Grammatically, I could not understand

"both add a file with after directory renames are the same filename"

I also found the same issue with `Expected` that Jonathan mentions. I ran the command separately and got

CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file