From 7a28394884166d38e74c75aafdbd0adb94536c3b Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Thu, 21 Aug 2008 00:39:56 -0500 Subject: [PATCH] Known bad. --- tests/t2500-server-update-ensure-merged.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/t2500-server-update-ensure-merged.sh b/tests/t2500-server-update-ensure-merged.sh index 2878996..83e1079 100644 --- a/tests/t2500-server-update-ensure-merged.sh +++ b/tests/t2500-server-update-ensure-merged.sh @@ -27,7 +27,7 @@ test_expect_success 'pushing just topic is okay' ' git push origin topic ' -test_expect_success 'if topic moves on, tagging candidate requires a merge' ' +test_expect_failure 'if topic moves on, tagging candidate requires a merge' ' git checkout -b candidate stable && git merge topic --no-ff && git push && @@ -68,7 +68,7 @@ test_expect_success 'if stable moves on, tagging candidate requires a merge' ' git push --tags ' -test_expect_success 'when creating a candidate, it must be a merge' ' +test_expect_failure 'when creating a candidate, it must be a merge' ' git checkout -b topic2 stable && echo "$test_name on topic2" >a && git commit -a -m "$test_name on topic2" && -- 2.39.5