--- a/tests/test-mq
+++ b/tests/test-mq
@@ -160,6 +160,17 @@ sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
hg status
+echo % qpush failure
+cd ..
+hg qrefresh
+hg qnew -mbar bar
+echo foo > foo
+hg add foo
+hg qrefresh
+hg qpop -a
+echo bar > foo
+hg qpush -a
+
cat >>$HGRCPATH <<EOF
[diff]
git = True
--- a/tests/test-mq.out
+++ b/tests/test-mq.out
@@ -164,6 +164,14 @@ diff -r cb9a9f314b8b b/f
@@ -0,0 +1,1 @@
+f
M a
+% qpush failure
+Patch queue now empty
+applying foo
+applying bar
+1 out of 1 hunk ignored -- saving rejects to file foo.rej
+patch failed, unable to continue (try -v)
+patch failed, rejects left in working dir
+Errors during apply, please fix and refresh bar
new file
diff --git a/new b/new