diff tests/test-mq-qrefresh.out @ 7113:f7fc5f5ecd62

mq: Allow qrefresh --silent to take parameters 'hg qrefresh --short file.txt' now adds changes made to file.txt to current patch. This builds on a patch for implementing --amend by Kirill Smelkov as discussed in issue933. FIXME: Why do mq refresh have two matchers if we only need one?
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 17 Oct 2008 21:26:39 +0200
parents 71e339714586
children 09ed32b79656
line wrap: on
line diff
--- a/tests/test-mq-qrefresh.out	Sat Oct 18 03:53:54 2008 -0500
+++ b/tests/test-mq-qrefresh.out	Fri Oct 17 21:26:39 2008 +0200
@@ -159,6 +159,48 @@
 @@ -1,1 +1,1 @@
 -base
 +patched
+% qrefresh --short
+% qdiff
+diff -r b55ecdccb5cf 1/base
+--- a/1/base
++++ b/1/base
+@@ -1,1 +1,1 @@
+-base
++patched
+diff -r b55ecdccb5cf 2/base
+--- a/2/base
++++ b/2/base
+@@ -1,1 +1,1 @@
+-base
++patched
+diff -r b55ecdccb5cf orphanchild
+--- /dev/null
++++ b/orphanchild
+@@ -0,0 +1,1 @@
++orphan
+% patch file contents
+mqbase
+
+diff -r b55ecdccb5cf 1/base
+--- a/1/base
++++ b/1/base
+@@ -1,1 +1,1 @@
+-base
++patched
+diff -r b55ecdccb5cf 2/base
+--- a/2/base
++++ b/2/base
+@@ -1,1 +1,1 @@
+-base
++patched
+% diff shows orphan ...
+A orphanchild
+? base
+diff
+--- /dev/null
++++ b/orphanchild
+@@ -0,0 +1,1 @@
++orphan
 % create test repo
 adding a
 % capture changes