Mercurial > public > mercurial-scm > hg

diff tests/test-mq-qdiff @ 10191:99d285ac5da4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: qdiff with the same diff options than qrefresh (issue1350) Specifically, if current patch is a git patch and mq.git=keep, diff in git mode.
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 21:49:05 +0100
parents 24bc6e414610
children a84f14228b1d
line wrap: on
line diff
--- a/tests/test-mq-qdiff	Fri Jan 01 21:21:34 2010 +0100
+++ b/tests/test-mq-qdiff	Fri Jan 01 21:49:05 2010 +0100
@@ -2,6 +2,8 @@
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
+echo "[mq]" >> $HGRCPATH
+echo "git=keep" >> $HGRCPATH
 
 echo % init
 hg init a
@@ -60,3 +62,9 @@
 
 echo % qdiff --reverse
 hg qdiff --nodates --reverse
+
+echo % qdiff preserve existing git flag
+hg qrefresh --git
+echo a >> lines
+hg qdiff
+