Mercurial > hg

comparison tests/test-mq-qfold.t @ 26780:bbf544b5f2e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: consistently use qrefresh
author timeless@mozdev.org
date Wed, 14 Oct 2015 03:30:27 -0400
parents 56b2bcea2529
children 4414d500604f
comparison
equal deleted inserted replaced
26779:aaa33ec3c951 26780:bbf544b5f2e9
57 57
58 Fold with local changes: 58 Fold with local changes:
59 59
60 $ echo d >> a 60 $ echo d >> a
61 $ hg qfold p3 61 $ hg qfold p3
62 abort: local changes found, refresh first 62 abort: local changes found, qrefresh first
63 [255] 63 [255]
64 64
65 $ hg diff -c . 65 $ hg diff -c .
66 diff -r 07f494440405 -r ???????????? a (glob) 66 diff -r 07f494440405 -r ???????????? a (glob)
67 --- a/a 67 --- a/a
179 (test that editor is not invoked before transaction starting, 179 (test that editor is not invoked before transaction starting,
180 and that combination of '--edit' and '--message' doesn't abort execution) 180 and that combination of '--edit' and '--message' doesn't abort execution)
181 181
182 $ rm -f .hg/last-message.txt 182 $ rm -f .hg/last-message.txt
183 $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3 183 $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3
184 refresh interrupted while patch was popped! (revert --all, qpush to recover) 184 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
185 abort: emulating unexpected abort 185 abort: emulating unexpected abort
186 [255] 186 [255]
187 $ test -f .hg/last-message.txt 187 $ test -f .hg/last-message.txt
188 [1] 188 [1]
189 189
230 HG: changed a 230 HG: changed a
231 ==== 231 ====
232 transaction abort! 232 transaction abort!
233 rollback completed 233 rollback completed
234 note: commit message saved in .hg/last-message.txt 234 note: commit message saved in .hg/last-message.txt
235 refresh interrupted while patch was popped! (revert --all, qpush to recover) 235 qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
236 abort: pretxncommit.unexpectedabort hook exited with status 1 236 abort: pretxncommit.unexpectedabort hook exited with status 1
237 [255] 237 [255]
238 $ cat .hg/last-message.txt 238 $ cat .hg/last-message.txt
239 original message 239 original message
240 240