--- a/tests/test-mq-qpush-fail.t Tue Nov 10 14:41:14 2015 -0800
+++ b/tests/test-mq-qpush-fail.t Tue Nov 10 14:52:54 2015 -0800
@@ -444,7 +444,7 @@
$ hg st a
M a
$ echo b >> b
- $ hg --config mq.keepchanges=1 qpop --force
+ $ hg --config mq.keepchanges=1 qpop --force --config 'ui.origbackuppath=.hg/origbackups'
popping p3
now at: p2
$ hg st b
@@ -461,4 +461,10 @@
now at: p2
$ hg st a
+test previous qpop (with --force and --config) saved .orig files to where user
+wants them
+ $ ls .hg/origbackups
+ b.orig
+ $ rm -rf .hg/origbackups
+
$ cd ..