]> git.ipfire.org Git - thirdparty/git.git/commit - t/t6423-merge-rename-directories.sh
t6423: rename file within directory that other side renamed
authorElijah Newren <newren@gmail.com>
Tue, 4 May 2021 02:12:07 +0000 (02:12 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 May 2021 03:53:48 +0000 (12:53 +0900)
commit15f3e1e05683ce710f22d9b1ef0f6b849f1d4b36
tree9a059418edbe9e12e82a76d539a259a10a048d7c
parentf3b964a07ef70eee6bacefd1ed5f94eb871be902
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>
t/t6423-merge-rename-directories.sh