diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 05:20:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 21:19:38 (GMT) |
| commit | c52ff85d97c698c902870305a010e2303e297b87 (patch) | |
| tree | 7c28c2849dd114a9f525891e8291f0319291fd2e /t/t6036-recursive-corner-cases.sh | |
| parent | 6bdaead1e58ab2aa3ea81a998117d1d5afb41a3b (diff) | |
| download | git-c52ff85d97c698c902870305a010e2303e297b87.zip git-c52ff85d97c698c902870305a010e2303e297b87.tar.gz git-c52ff85d97c698c902870305a010e2303e297b87.tar.bz2 | |
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
When renaming one file to two files, we really should be doing a content
merge. Also, in the recursive case, undoing the renames and recording the
merged file in the index with the source of the rename (while deleting
both destinations) allows the renames to be re-detected in the
non-recursive merge and will result in fewer spurious conflicts.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 314fdae..5a7af0c 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -633,7 +633,7 @@ test_expect_success 'setup rename/rename(1to2)/modify followed by what looks lik git tag E ' -test_expect_failure 'handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' ' +test_expect_success 'handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' ' git checkout D^0 && git merge -s recursive E^0 && |