Test operations on hidden patches

[stgit] / t / t1203-push-conflict.sh

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index 72bd49fe45b58f73f692891a54f6097614ab3754..96fee15a8340534e7f22cca3c232c1101252cd11 100755 (executable)
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -38,7 +38,7 @@ test_expect_success \
 test_expect_success \
        'Push the first patch with conflict' \
        '
 test_expect_success \
        'Push the first patch with conflict' \
        '

-       ! stg push foo
+       conflict_old stg push foo

        '
 
 test_expect_success \
        '
 
 test_expect_success \


@@ -56,7 +56,7 @@ test_expect_success \
 test_expect_success \
        'Check that pop will fail while there are unmerged conflicts' \
        '
 test_expect_success \
        'Check that pop will fail while there are unmerged conflicts' \
        '

-       ! stg pop
+       command_error stg pop

        '
 
 test_expect_success \
        '
 
 test_expect_success \