Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 46026:39e2cf7cb120 stable
tests: show that in-memory rebase leaves state when working copy is dirty
When in-memory rebase falls back to on-disk rebase, it checks if the
working copy is dirty. If it is, it aborts the rebase. However, it
leaves the rebase state on disk. I broke it in feffeb18d412 (rebase:
teach in-memory rebase to not restart with on-disk rebase on conflict,
2020-09-18).
Differential Revision: https://phab.mercurial-scm.org/D9508
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 02 Dec 2020 15:15:16 -0800 |
parents | feffeb18d412 |
children | 1d5189a57405 |
comparison
equal
deleted
inserted
replaced
46025:27c23c8f14da | 46026:39e2cf7cb120 |
---|---|
485 rollback completed | 485 rollback completed |
486 abort: uncommitted changes | 486 abort: uncommitted changes |
487 [255] | 487 [255] |
488 $ cat a | 488 $ cat a |
489 dirty | 489 dirty |
490 $ hg status -v | |
491 M a | |
492 # The repository is in an unfinished *rebase* state. | |
493 | |
494 # To continue: hg rebase --continue | |
495 # To abort: hg rebase --abort | |
496 # To stop: hg rebase --stop | |
497 | |
490 | 498 |
491 Retrying without in-memory merge won't lose merge state | 499 Retrying without in-memory merge won't lose merge state |
492 $ cd .. | 500 $ cd .. |
493 $ hg clone repo3 repo3-merge-state -q | 501 $ hg clone repo3 repo3-merge-state -q |
494 $ cd repo3-merge-state | 502 $ cd repo3-merge-state |