summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2010-09-20 02:29:07 -0600
committerJunio C Hamano <gitster@pobox.com>2010-09-29 17:37:05 -0700
commit4ab9a157d06956ce5a1060a28404cbade3039fa2 (patch)
tree0f3d2f973c2aac4f780d10ba13c030498b62e508 /t/t6022-merge-rename.sh
parent2adc7dcc111636ed16601dc7516ced1c5cfda088 (diff)
downloadgit-4ab9a157d06956ce5a1060a28404cbade3039fa2.tar.gz
merge_content(): Check whether D/F conflicts are still present
If all the paths below some directory involved in a D/F conflict were not removed during the rest of the merge, then the contents of the file whose path conflicted needs to be recorded in file with an alternative filename. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
-rwxr-xr-xt/t6022-merge-rename.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 0b6700242c..422092e11c 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -394,7 +394,7 @@ test_expect_success 'Rename+D/F conflict; renamed file merges + dir not in way'
test_cmp expected dir
'
-test_expect_failure 'Rename+D/F conflict; renamed file merges but dir in way' '
+test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
git reset --hard &&
rm -rf dir~* &&
git checkout -q renamed-file-has-no-conflicts^0 &&
@@ -415,7 +415,7 @@ test_expect_failure 'Rename+D/F conflict; renamed file merges but dir in way' '
test_cmp expected dir~HEAD
'
-test_expect_failure 'Same as previous, but merged other way' '
+test_expect_success 'Same as previous, but merged other way' '
git reset --hard &&
rm -rf dir~* &&
git checkout -q dir-in-way^0 &&
@@ -471,7 +471,7 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in
test_cmp expected dir
'
-test_expect_failure 'Rename+D/F conflict; renamed file cannot merge and dir in the way' '
+test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in the way' '
modify s/dir-not-in-way/dir-in-way/ expected &&
git reset --hard &&
@@ -509,7 +509,7 @@ cat >expected <<\EOF &&
>>>>>>> renamed-file-has-conflicts
EOF
-test_expect_failure 'Same as previous, but merged other way' '
+test_expect_success 'Same as previous, but merged other way' '
git reset --hard &&
rm -rf dir~* &&
git checkout -q dir-in-way^0 &&