Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
7112:c9b88695d894 | 7113:f7fc5f5ecd62 |
---|---|
157 --- a/2/base | 157 --- a/2/base |
158 +++ b/2/base | 158 +++ b/2/base |
159 @@ -1,1 +1,1 @@ | 159 @@ -1,1 +1,1 @@ |
160 -base | 160 -base |
161 +patched | 161 +patched |
162 % qrefresh --short | |
163 % qdiff | |
164 diff -r b55ecdccb5cf 1/base | |
165 --- a/1/base | |
166 +++ b/1/base | |
167 @@ -1,1 +1,1 @@ | |
168 -base | |
169 +patched | |
170 diff -r b55ecdccb5cf 2/base | |
171 --- a/2/base | |
172 +++ b/2/base | |
173 @@ -1,1 +1,1 @@ | |
174 -base | |
175 +patched | |
176 diff -r b55ecdccb5cf orphanchild | |
177 --- /dev/null | |
178 +++ b/orphanchild | |
179 @@ -0,0 +1,1 @@ | |
180 +orphan | |
181 % patch file contents | |
182 mqbase | |
183 | |
184 diff -r b55ecdccb5cf 1/base | |
185 --- a/1/base | |
186 +++ b/1/base | |
187 @@ -1,1 +1,1 @@ | |
188 -base | |
189 +patched | |
190 diff -r b55ecdccb5cf 2/base | |
191 --- a/2/base | |
192 +++ b/2/base | |
193 @@ -1,1 +1,1 @@ | |
194 -base | |
195 +patched | |
196 % diff shows orphan ... | |
197 A orphanchild | |
198 ? base | |
199 diff | |
200 --- /dev/null | |
201 +++ b/orphanchild | |
202 @@ -0,0 +1,1 @@ | |
203 +orphan | |
162 % create test repo | 204 % create test repo |
163 adding a | 205 adding a |
164 % capture changes | 206 % capture changes |
165 diff --git a/a b/ab | 207 diff --git a/a b/ab |
166 copy from a | 208 copy from a |