X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f9d9a06200ab37e52ac737ce9e3c050100e5aa15..de8efe1efc4a495eca0614aa9f6c1910d5838f99:/t/t2000-sync.sh diff --git a/t/t2000-sync.sh b/t/t2000-sync.sh index 00ea7bd..696d698 100755 --- a/t/t2000-sync.sh +++ b/t/t2000-sync.sh @@ -18,15 +18,15 @@ test_expect_success \ ' stg new p1 -m p1 && echo foo1 > foo1.txt && - git add foo1.txt && + stg add foo1.txt && stg refresh && stg new p2 -m p2 && echo foo2 > foo2.txt && - git add foo2.txt && + stg add foo2.txt && stg refresh && stg new p3 -m p3 && echo foo3 > foo3.txt && - git add foo3.txt && + stg add foo3.txt && stg refresh && stg export && stg pop && @@ -86,7 +86,7 @@ test_expect_success \ stg refresh && stg goto p2 && echo bar2 > bar2.txt && - git add bar2.txt && + stg add bar2.txt && stg refresh && stg goto p3 && echo bar3 >> foo3.txt && @@ -117,7 +117,7 @@ test_expect_success \ ' [ "$(echo $(stg series --applied --noprefix))" = "p1" ] && [ "$(echo $(stg series --unapplied --noprefix))" = "p2 p3" ] && - stg resolved -a && + stg add --update && stg refresh && stg goto p3 [ "$(echo $(stg series --applied --noprefix))" = "p1 p2 p3" ] && @@ -135,7 +135,7 @@ test_expect_success \ ' [ "$(echo $(stg series --applied --noprefix))" = "p1 p2 p3" ] && [ "$(echo $(stg series --unapplied --noprefix))" = "" ] && - stg resolved -a && + stg add --update && stg refresh && [ "$(echo $(stg series --applied --noprefix))" = "p1 p2 p3" ] && [ "$(echo $(stg series --unapplied --noprefix))" = "" ]