diff tests/test-mq-qpush-fail.t @ 22545:6a2cfa61acb0

mq: upgrade non-plain patches to HG format when setting parent in patchheader Parent will now always be updated or added when qrefreshing HG patches. Plain patches will not be changed, but patches that neither are plain nor HG will be upgraded to HG patches on first refresh.
author Mads Kiilerich <madski@unity3d.com>
date Sat, 20 Sep 2014 17:06:57 +0200
parents fd0f0b0d316d
children c63a09b6b337
line wrap: on
line diff
--- a/tests/test-mq-qpush-fail.t	Sat Sep 20 17:06:56 2014 +0200
+++ b/tests/test-mq-qpush-fail.t	Sat Sep 20 17:06:57 2014 +0200
@@ -23,7 +23,7 @@
   $ echo bar > bar
   $ hg add bar
   $ hg qrefresh -m 'patch 2'
-  $ hg qnew --config 'mq.plain=true' bad-patch
+  $ hg qnew --config 'mq.plain=true' -U bad-patch
   $ echo >> foo
   $ hg qrefresh
   $ hg qpop -a