Show More
@@ -155,6 +155,31 b' hg qrefresh' | |||||
155 | hg qdiff --nodates |
|
155 | hg qdiff --nodates | |
156 | cd .. |
|
156 | cd .. | |
157 |
|
157 | |||
|
158 | echo '% issue2025: qrefresh does not honor filtering options when tip != qtip' | |||
|
159 | hg init repo-2025 | |||
|
160 | cd repo-2025 | |||
|
161 | echo a > a | |||
|
162 | echo b > b | |||
|
163 | hg ci -qAm addab | |||
|
164 | echo a >> a | |||
|
165 | echo b >> b | |||
|
166 | hg qnew -f patch | |||
|
167 | hg up -qC 0 | |||
|
168 | echo c > c | |||
|
169 | hg ci -qAm addc | |||
|
170 | hg up -qC 1 | |||
|
171 | echo '% refresh with tip != qtip' | |||
|
172 | hg --config diff.nodates=1 qrefresh -I b 2>&1 \ | |||
|
173 | | sed 's/saving bundle.*/saving bundle.../g' | |||
|
174 | echo '% status after refresh' | |||
|
175 | hg st | |||
|
176 | echo '% b after refresh' | |||
|
177 | cat b | |||
|
178 | echo '% patch file after refresh' | |||
|
179 | cat .hg/patches/patch | |||
|
180 | cd .. | |||
|
181 | ||||
|
182 | ||||
158 | echo % issue1441 with git patches |
|
183 | echo % issue1441 with git patches | |
159 | hg init repo-1441-git |
|
184 | hg init repo-1441-git | |
160 | cd repo-1441-git |
|
185 | cd repo-1441-git |
@@ -259,6 +259,26 b' diff -r 000000000000 b' | |||||
259 | +++ b/b |
|
259 | +++ b/b | |
260 | @@ -0,0 +1,1 @@ |
|
260 | @@ -0,0 +1,1 @@ | |
261 | +a |
|
261 | +a | |
|
262 | % issue2025: qrefresh does not honor filtering options when tip != qtip | |||
|
263 | % refresh with tip != qtip | |||
|
264 | saving bundle... | |||
|
265 | adding branch | |||
|
266 | adding changesets | |||
|
267 | adding manifests | |||
|
268 | adding file changes | |||
|
269 | added 1 changesets with 1 changes to 1 files | |||
|
270 | % status after refresh | |||
|
271 | M a | |||
|
272 | % b after refresh | |||
|
273 | b | |||
|
274 | b | |||
|
275 | % patch file after refresh | |||
|
276 | diff -r 1a60229be7ac b | |||
|
277 | --- a/b | |||
|
278 | +++ b/b | |||
|
279 | @@ -1,1 +1,2 @@ | |||
|
280 | b | |||
|
281 | +b | |||
262 | % issue1441 with git patches |
|
282 | % issue1441 with git patches | |
263 | diff --git a/b b/b |
|
283 | diff --git a/b b/b | |
264 | new file mode 100644 |
|
284 | new file mode 100644 |
General Comments 0
You need to be logged in to leave comments.
Login now