# # patch "tests/t_sticky_branch.at" # from [452ed835d2e831480a7fff9ef2c8b5c539bcbf85] # to [232b47d5ba86cd863dae9d2ecdf92f477114d51d] # ======================================================================== --- tests/t_sticky_branch.at 452ed835d2e831480a7fff9ef2c8b5c539bcbf85 +++ tests/t_sticky_branch.at 232b47d5ba86cd863dae9d2ecdf92f477114d51d @@ -47,12 +47,12 @@ AT_CHECK(cmp otherdir/foo updir/foo) # merge doesn't affect given branch -AT_CHECK(MONOTONE setup --branch=testbranch third1, [], [ignore], [ignore]) +AT_CHECK(MONOTONE co --branch=testbranch third1, [], [ignore], [ignore]) AT_DATA(third1/a, [1a ]) AT_CHECK(cd third1 && MONOTONE add a, [], [ignore], [ignore]) AT_CHECK(cd third1 && MONOTONE commit --branch=third --message=foo, [], [ignore], [ignore]) -AT_CHECK(MONOTONE setup --branch=testbranch third2, [], [ignore], [ignore]) +AT_CHECK(MONOTONE co --branch=testbranch third2, [], [ignore], [ignore]) AT_DATA(third2/b, [2b ]) AT_CHECK(cd third2 && MONOTONE add b, [], [ignore], [ignore])