diff tests/test-mq-qimport @ 7160:1b7b21b634f2

mq: make qimport -f work properly. Closes issue1255. From Bernhard Leiner.
author Brendan Cully <brendan@kublai.com>
date Sat, 18 Oct 2008 17:29:45 -0700
parents d1d011accf94
children e7f6401584f7 8046f0a070a6
line wrap: on
line diff
--- a/tests/test-mq-qimport	Sat Oct 18 16:53:44 2008 -0700
+++ b/tests/test-mq-qimport	Sat Oct 18 17:29:45 2008 -0700
@@ -36,6 +36,22 @@
 hg qimport file://$HGTMP/url.diff
 hg qun
 
+echo % import patch that already exists
+echo foo2 >> foo
+hg add foo
+hg diff > ../url.diff
+hg revert --no-backup foo
+rm foo
+hg qimport ../url.diff
+hg qpush
+cat foo
+hg qpop
+echo % qimport -f
+hg qimport -f ../url.diff
+hg qpush
+cat foo
+hg qpop
+
 echo % build diff with CRLF
 python ../writelines.py b 5 'a\n' 5 'a\r\n'
 hg ci -Am addb