test_expect_success 'Initialize StGit stack with three patches' '
stg init &&
echo 000 >> a &&
- git add a &&
+ stg add a &&
git commit -m a &&
echo 111 >> a &&
git commit -a -m p1 &&
C a
EOF
test_expect_success 'Pop middle patch, creating a conflict' '
- conflict_old stg pop p2 &&
+ conflict stg pop p2 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
test "$(echo $(stg series))" = "+ p1 > p3 - p2"
stg reset --hard master.stgit^~1 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
- test "$(echo $(stg series))" = "> p1 - p3 - p2"
+ test "$(echo $(stg series))" = "+ p1 + p2 > p3"
'
test_done