test_expect_success \
'Check the "new" and "refresh" logs' \
'
- stg log --full foo | grep -q -e "^new" &&
stg log --full foo | grep -q -e "^refresh" &&
- stg log --full | grep -q -e "^new" &&
stg log --full | grep -q -e "^refresh"
'
echo bar > test && stg refresh &&
stg pop &&
echo foo > test && stg refresh &&
- ! stg push &&
+ conflict_old stg push &&
stg log --full | grep -q -e "^push(c) "
'