Skip to content
Snippets Groups Projects
Commit d767f71b9158 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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
parent ecef004c6410
No related branches found
No related tags found
No related merge requests found
......@@ -487,6 +487,14 @@
[20]
$ cat a
dirty
$ hg status -v
M a
# The repository is in an unfinished *rebase* state.
# To continue: hg rebase --continue
# To abort: hg rebase --abort
# To stop: hg rebase --stop
Retrying without in-memory merge won't lose merge state
$ cd ..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment