Mercurial > hg
view tests/test-dirstate-nonnormalset.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 | 127cc7f78475 |
children | ed84a4d48910 |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [ui] > logtemplate="{rev}:{node|short} ({phase}) [{tags} {bookmarks}] {desc|firstline}\n" > [extensions] > dirstateparanoidcheck = $TESTDIR/../contrib/dirstatenonnormalcheck.py > [experimental] > nonnormalparanoidcheck = True > [devel] > all-warnings=True > EOF $ mkcommit() { > echo "$1" > "$1" > hg add "$1" > hg ci -m "add $1" > } $ hg init testrepo $ cd testrepo $ mkcommit a $ mkcommit b $ mkcommit c $ hg status