Mercurial > hg-stable

diff tests/test-mq-qpush-fail.t @ 26943:263edb591b72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: let the user choose where .orig files are kept This patch uses cmdutil.origpath to let the user decide where .orig files are kept when backup files are created.
author Christian Delahousse <cdelahousse@fb.com>
date Tue, 10 Nov 2015 14:52:54 -0800
parents bbf544b5f2e9
children 87bca10a06ed
line wrap: on
line diff
--- 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 ..