Mercurial > public > mercurial-scm > hg-stable
diff tests/test-mq-qrefresh-replace-log-message.t @ 26780:bbf544b5f2e9
mq: consistently use qrefresh
| author | timeless@mozdev.org |
|---|---|
| date | Wed, 14 Oct 2015 03:30:27 -0400 |
| parents | 520defbc0335 |
| children | 4414d500604f |
line wrap: on
line diff
--- a/tests/test-mq-qrefresh-replace-log-message.t Wed Oct 14 02:06:54 2015 -0400 +++ b/tests/test-mq-qrefresh-replace-log-message.t Wed Oct 14 03:30:27 2015 -0400 @@ -139,7 +139,7 @@ $ rm -f .hg/last-message.txt $ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e - 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 @@ -188,7 +188,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 @@ -231,7 +231,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] @@ -269,7 +269,7 @@ ==== transaction abort! rollback completed - 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] @@ -311,7 +311,7 @@ ==== transaction abort! rollback completed - 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]