Mercurial > hg
comparison tests/test-rebase-abort.t @ 38182:79c54e7c0c52 stable
rebase: prioritize indicating an interrupted rebase over update (issue5838)
This should also cover the transplant extension, and any other non clearable
states.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 02 Jun 2018 13:44:44 -0400 |
| parents | 712d6f535fc9 |
| children | 09680349cc2d |
comparison
equal
deleted
inserted
replaced
| 38181:712d6f535fc9 | 38182:79c54e7c0c52 |
|---|---|
| 385 .hg/rebasestate | 385 .hg/rebasestate |
| 386 .hg/undo.backup.dirstate | 386 .hg/undo.backup.dirstate |
| 387 .hg/undo.dirstate | 387 .hg/undo.dirstate |
| 388 .hg/updatestate | 388 .hg/updatestate |
| 389 | 389 |
| 390 XXX: This should complain about needing to abort/continue rebase | |
| 391 $ hg rebase -s 3 -d tip | 390 $ hg rebase -s 3 -d tip |
| 392 abort: last update was interrupted | 391 abort: rebase in progress |
| 393 (use 'hg update' to get a consistent checkout) | 392 (use 'hg rebase --continue' or 'hg rebase --abort') |
| 394 [255] | 393 [255] |
| 395 $ hg up . | 394 $ hg up . |
| 396 abort: rebase in progress | 395 abort: rebase in progress |
| 397 (use 'hg rebase --continue' or 'hg rebase --abort') | 396 (use 'hg rebase --continue' or 'hg rebase --abort') |
| 398 [255] | 397 [255] |
| 399 $ hg up -C . | 398 $ hg up -C . |
| 400 abort: rebase in progress | 399 abort: rebase in progress |
| 401 (use 'hg rebase --continue' or 'hg rebase --abort') | 400 (use 'hg rebase --continue' or 'hg rebase --abort') |
| 402 [255] | 401 [255] |
| 403 | 402 |
| 404 XXX: This should complain about needing to abort/continue rebase | |
| 405 $ hg graft 3 | 403 $ hg graft 3 |
| 406 abort: last update was interrupted | 404 abort: rebase in progress |
| 407 (use 'hg update' to get a consistent checkout) | 405 (use 'hg rebase --continue' or 'hg rebase --abort') |
| 408 [255] | 406 [255] |
| 409 | 407 |
| 410 $ hg rebase --abort | 408 $ hg rebase --abort |
| 411 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg | 409 saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg |
| 412 rebase aborted | 410 rebase aborted |