##// END OF EJS Templates
tests: demonstrate inconsistent messaging around interrupted rebases
Matt Harbison -
r38219:712d6f53 stable
parent child Browse files
Show More
@@ -376,6 +376,37 b' test aborting an interrupted series (iss'
376 rebasing 4:e80b69427d80 "c"
376 rebasing 4:e80b69427d80 "c"
377 abort: ^C
377 abort: ^C
378 [255]
378 [255]
379
380 New operations are blocked with the correct state message
381
382 $ find .hg -name '*state' -prune | sort
383 .hg/dirstate
384 .hg/merge/state
385 .hg/rebasestate
386 .hg/undo.backup.dirstate
387 .hg/undo.dirstate
388 .hg/updatestate
389
390 XXX: This should complain about needing to abort/continue rebase
391 $ hg rebase -s 3 -d tip
392 abort: last update was interrupted
393 (use 'hg update' to get a consistent checkout)
394 [255]
395 $ hg up .
396 abort: rebase in progress
397 (use 'hg rebase --continue' or 'hg rebase --abort')
398 [255]
399 $ hg up -C .
400 abort: rebase in progress
401 (use 'hg rebase --continue' or 'hg rebase --abort')
402 [255]
403
404 XXX: This should complain about needing to abort/continue rebase
405 $ hg graft 3
406 abort: last update was interrupted
407 (use 'hg update' to get a consistent checkout)
408 [255]
409
379 $ hg rebase --abort
410 $ hg rebase --abort
380 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
411 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
381 rebase aborted
412 rebase aborted
General Comments 0
You need to be logged in to leave comments. Login now