diff tests/test-mq-qfold.out @ 10186:296a0b14a686 stable 1.4.2

mq: preserve --git flag when folding patches

Without this, folding a git patch into a regular one downgrades the resulting
patch to a regular patch.

--- a/tests/test-mq-qfold.out	Fri Jan 01 19:53:05 2010 +0100
+++ b/tests/test-mq-qfold.out	Fri Jan 01 19:53:05 2010 +0100
@@ -25,3 +25,40 @@
  a
 +a
 +b
+reverting a
+% fold git patch into a regular patch, expect git patch
+popping git
+now at: regular
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,3 +1,4 @@
+ a
+ a
+ b
++a
+diff --git a/a b/aa
+copy from a
+copy to aa
+--- a/a
++++ b/aa
+@@ -1,3 +1,4 @@
+ a
+ a
+ b
++a
+popping regular
+now at: p1
+% fold regular patch into a git patch, expect git patch
+popping regular
+now at: git
+diff --git a/a b/aa
+copy from a
+copy to aa
+--- a/a
++++ b/aa
+@@ -1,3 +1,4 @@
+ a
+ a
+ b
++b