diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-05-04 02:12:07 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-04 12:53:48 +0900 |
| commit | 15f3e1e05683ce710f22d9b1ef0f6b849f1d4b36 (patch) | |
| tree | 9a059418edbe9e12e82a76d539a259a10a048d7c /diffcore-order.c | |
| parent | Add testing with merge-ort merge strategy (diff) | |
| download | tgif-15f3e1e05683ce710f22d9b1ef0f6b849f1d4b36.tar.xz | |
t6423: rename file within directory that other side renamed
Add a new testcase where one side of history renames:
olddir/ -> newdir/
and the other side of history renames:
olddir/a -> olddir/alpha
When using merge.directoryRenames=true, it seems logical to expect the
file to end up at newdir/alpha. Unfortunately, both merge-recursive and
merge-ort currently see this as a rename/rename conflict:
olddir/a -> newdir/a
vs.
olddir/a -> newdir/alpha
Suggesting that there's some extra logic we probably want to add
somewhere to allow this case to run without triggering a conflict. For
now simply document this known issue.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions