X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/78e5af69d99659769b052e4c00fe5b23a8356231..f249607484ed865696bd96a2055468b98b4e319f:/t/t1202-push-undo.sh diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index b602643..79439de 100755 --- a/t/t1202-push-undo.sh +++ b/t/t1202-push-undo.sh @@ -3,10 +3,10 @@ # Copyright (c) 2006 Catalin Marinas # -test_description='Exercise push --undo with missing files. +test_description='Exercise stg undo with push of missing files. Test the case where a patch fails to be pushed because it modifies a -missing file. The "push --undo" command has to be able to revert it. +missing file. The "stg undo" command has to be able to revert it. ' . ./test-lib.sh @@ -43,19 +43,19 @@ test_expect_success \ test_expect_success \ 'Push the second patch with conflict' \ ' - ! stg push bar + conflict_old stg push bar ' test_expect_success \ 'Undo the previous push' \ ' - stg push --undo + stg undo --hard ' test_expect_success \ 'Check the push after undo fails as well' \ ' - ! stg push bar + conflict_old stg push bar ' test_expect_success \ @@ -64,7 +64,7 @@ test_expect_success \ touch newfile && git add newfile && rm newfile && - stg push --undo + stg undo --hard ' test_done