# 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
'
stg new foo -m foo &&
echo foo > test &&
- git add test &&
+ stg add test &&
stg refresh
'
'
stg new bar -m bar &&
echo bar > test &&
- git add test &&
+ stg add test &&
stg refresh
'
test_expect_success \
'Push the second patch with conflict' \
'
- ! stg push bar
+ conflict 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 stg push bar
'
test_expect_success \
'Undo with disappeared newborn' \
'
touch newfile &&
- git add newfile &&
+ stg add newfile &&
rm newfile &&
- stg push --undo
+ stg undo --hard
'
test_done