[PATCH] Add a reminder test case for a merge with F/D transition

[Alex Riesen <raa.lkml@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]

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>
---

2009/5/11 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
>
> Maybe you can turn this into a patch adding a test (with
> test_expect_failure to mark it as a bug)?  This would make debugging a lot
> easier, as a non-installed Git could be tested.

Here.

 t/t6020-merge-df.sh |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index a19d49d..b62b52a 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -22,4 +22,27 @@ git commit -m "File: dir"'

 test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'

+test_expect_failure 'F/D conflict' '
+	git reset --hard &&
+	git checkout master &&
+	rm .git/index &&
+
+	mkdir before &&
+	echo FILE >before/one &&
+	echo FILE >after &&
+	git add . &&
+	git commit -mfirst &&
+
+	rm -f after &&
+	git mv before after &&
+	git commit -mmove &&
+
+	git checkout -b para HEAD^ &&
+	echo COMPLETELY ANOTHER FILE >another &&
+	git add . &&
+	git commit -mpara &&
+
+	git merge master
+'
+
 test_done
-- 
1.6.3.28.ga852b

[-- Attachment #2: 0001-Add-a-reminder-test-case-for-a-merge-with-F-D-transi.txt --]
[-- Type: text/plain, Size: 1459 bytes --]

From 05433a6f896c40e4a039815d86613d7e351ef0da Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 11 May 2009 11:31:42 +0200
Subject: [PATCH] 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>
---
 t/t6020-merge-df.sh |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index a19d49d..b62b52a 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -22,4 +22,27 @@ git commit -m "File: dir"'
 
 test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
 
+test_expect_failure 'F/D conflict' '
+	git reset --hard &&
+	git checkout master &&
+	rm .git/index &&
+
+	mkdir before &&
+	echo FILE >before/one &&
+	echo FILE >after &&
+	git add . &&
+	git commit -mfirst &&
+
+	rm -f after &&
+	git mv before after &&
+	git commit -mmove &&
+
+	git checkout -b para HEAD^ &&
+	echo COMPLETELY ANOTHER FILE >another &&
+	git add . &&
+	git commit -mpara &&
+
+	git merge master
+'
+
 test_done
-- 
1.6.3.28.ga852b