# HG changeset patch # User Martin von Zweigbergk # Date 1606950916 28800 # Node ID 39e2cf7cb12038beb0f02c81059ca724724e9bb2 # Parent 27c23c8f14da48a24a0896b588721c0139e92560 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 diff -r 27c23c8f14da -r 39e2cf7cb120 tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t Fri Nov 27 14:54:37 2020 -0500 +++ b/tests/test-rebase-inmemory.t Wed Dec 02 15:15:16 2020 -0800 @@ -487,6 +487,14 @@ [255] $ 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 ..