Mercurial > hg
comparison tests/test-mq-qpush-fail.t @ 16654:490ed8972f1b
mq: introduce qpush --check
qpush --check let you qpush with uncommitted files not overlapping
patched files.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sat, 12 May 2012 00:19:30 +0200 |
parents | 73b8c2554be8 |
children | 6ca125af882f |
comparison
equal
deleted
inserted
replaced
16653:73b8c2554be8 | 16654:490ed8972f1b |
---|---|
315 patching file a | 315 patching file a |
316 a | 316 a |
317 now at: p2 | 317 now at: p2 |
318 $ test -f a.orig && echo 'error: backup with --no-backup' | 318 $ test -f a.orig && echo 'error: backup with --no-backup' |
319 [1] | 319 [1] |
320 | |
321 test qpush --check | |
322 | |
323 $ hg qpush --check --force | |
324 abort: cannot use both --force and --check | |
325 [255] | |
326 $ hg qpush --check --exact | |
327 abort: cannot use --exact and --check together | |
328 [255] | |
329 $ echo b >> b | |
330 $ hg qpush --check | |
331 applying p3 | |
332 errors during apply, please fix and refresh p2 | |
333 [2] | |
334 $ rm b | |
335 $ hg qpush --check | |
336 applying p3 | |
337 errors during apply, please fix and refresh p2 | |
338 [2] | |
339 $ hg rm -A b | |
340 $ hg qpush --check | |
341 applying p3 | |
342 errors during apply, please fix and refresh p2 | |
343 [2] | |
344 $ hg revert -aq b | |
345 $ echo d > d | |
346 $ hg add d | |
347 $ hg qpush --check | |
348 applying p3 | |
349 errors during apply, please fix and refresh p2 | |
350 [2] | |
351 $ hg forget d | |
352 $ rm d | |
353 $ hg qpop | |
354 popping p2 | |
355 patch queue now empty | |
356 $ echo b >> b | |
357 $ hg qpush -a --check | |
358 applying p2 | |
359 applying p3 | |
360 errors during apply, please fix and refresh p2 | |
361 [2] | |
362 $ hg qtop | |
363 p2 | |
364 $ hg parents --template "{rev} {desc}\n" | |
365 2 imported patch p2 | |
366 $ hg st b | |
367 M b | |
368 $ cat b | |
369 b | |
370 b |