Mercurial > hg
diff tests/test-mq-qfold.t @ 26780:bbf544b5f2e9
mq: consistently use qrefresh
author | timeless@mozdev.org |
---|---|
date | Wed, 14 Oct 2015 03:30:27 -0400 |
parents | 56b2bcea2529 |
children | 4414d500604f |
line wrap: on
line diff
--- a/tests/test-mq-qfold.t Wed Oct 14 02:06:54 2015 -0400 +++ b/tests/test-mq-qfold.t Wed Oct 14 03:30:27 2015 -0400 @@ -59,7 +59,7 @@ $ echo d >> a $ hg qfold p3 - abort: local changes found, refresh first + abort: local changes found, qrefresh first [255] $ hg diff -c . @@ -181,7 +181,7 @@ $ rm -f .hg/last-message.txt $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3 - refresh interrupted while patch was popped! (revert --all, qpush to recover) + qrefresh interrupted while patch was popped! (revert --all, qpush to recover) abort: emulating unexpected abort [255] $ test -f .hg/last-message.txt @@ -232,7 +232,7 @@ transaction abort! rollback completed note: commit message saved in .hg/last-message.txt - refresh interrupted while patch was popped! (revert --all, qpush to recover) + qrefresh interrupted while patch was popped! (revert --all, qpush to recover) abort: pretxncommit.unexpectedabort hook exited with status 1 [255] $ cat .hg/last-message.txt