| commit | 1c9b2d3aa12ea4e34c1d04cc2af4e07a1eecb964 | |
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Mon, 11 May 2009 09:31:42 +0000 (11 11:31 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Jul 2009 17:26:10 +0000 (29 10:26 -0700) | ||
| tree | 68cd07352fb9ca73fa3f8338331324b6125ee131 | treesnapshot (tar.gz zip) |
| parent | 6641575963388b61f408f177d91cdacad25d2e26 | commitdiff |
Add a reminder test case for a merge with F/D transition
The problem is that if a file was replaced with a directory containing
another file with the same content and mode, an attempt to merge it
with a branch descended from a commit before this F->D transition will
cause merge-recursive to break. It breaks even if there were no
conflicting changes on that other branch.
Originally reported by Anders Melchiorsen.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The problem is that if a file was replaced with a directory containing
another file with the same content and mode, an attempt to merge it
with a branch descended from a commit before this F->D transition will
cause merge-recursive to break. It breaks even if there were no
conflicting changes on that other branch.
Originally reported by Anders Melchiorsen.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6020-merge-df.sh | diffblobblamehistory |