Mercurial > hg
comparison tests/test-mq-qpush-fail.t @ 16635:9d76320d8b99 stable
mq: add --no-backup for qpush/qpop/qgoto
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Fri, 11 May 2012 16:57:26 +0200 |
parents | 435375cc0ca0 |
children | 73b8c2554be8 |
comparison
equal
deleted
inserted
replaced
16634:435375cc0ca0 | 16635:9d76320d8b99 |
---|---|
186 a | 186 a |
187 $ cat b.orig | 187 $ cat b.orig |
188 bb | 188 bb |
189 $ cat c.orig | 189 $ cat c.orig |
190 cc | 190 cc |
191 | |
192 test qpop --force --no-backup | |
193 | |
194 $ hg qpush | |
195 applying p1 | |
196 now at: p1 | |
197 $ rm a.orig | |
198 $ echo a >> a | |
199 $ hg qpop --force --no-backup --verbose | |
200 popping p1 | |
201 patch queue now empty | |
202 $ test -f a.orig && echo 'error: backup with --no-backup' | |
203 [1] | |
191 | 204 |
192 test qpush --force and backup files | 205 test qpush --force and backup files |
193 | 206 |
194 $ echo a >> a | 207 $ echo a >> a |
195 $ hg qnew p2 | 208 $ hg qnew p2 |
235 $ cat b.orig | 248 $ cat b.orig |
236 b | 249 b |
237 b1 | 250 b1 |
238 $ cat d.orig | 251 $ cat d.orig |
239 d1 | 252 d1 |
253 | |
254 test qpush --force --no-backup | |
255 | |
256 $ hg revert -qa | |
257 $ hg qpop -a | |
258 popping p3 | |
259 popping p2 | |
260 patch queue now empty | |
261 $ echo a >> a | |
262 $ rm a.orig | |
263 $ hg qpush --force --no-backup --verbose | |
264 applying p2 | |
265 patching file a | |
266 a | |
267 now at: p2 | |
268 $ test -f a.orig && echo 'error: backup with --no-backup' | |
269 [1] | |
270 | |
271 test qgoto --force --no-backup | |
272 | |
273 $ hg qpop | |
274 popping p2 | |
275 patch queue now empty | |
276 $ echo a >> a | |
277 $ hg qgoto --force --no-backup p2 --verbose | |
278 applying p2 | |
279 patching file a | |
280 a | |
281 now at: p2 | |
282 $ test -f a.orig && echo 'error: backup with --no-backup' | |
283 [1] |