Mercurial > hg-stable
view tests/test-dirstate-backup.t @ 45874:781b09790633
tests: show that interactive shelve can leave the repo with a merge state
If part of a file is shelved (as we already do in a test), there will
be an unfinished merge state left after `hg shelve` finishes. There
should never be a merge conflict and there should never be a reason
that the user would like to re-resolve conflicts, so we should clear
that state (see next patch).
Differential Revision: https://phab.mercurial-scm.org/D9334
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Nov 2020 22:38:36 -0800 |
parents | 8d72e29ad1e0 |
children | ffd19d73518d |
line wrap: on
line source
Set up $ hg init repo $ cd repo Try to import an empty patch $ hg import --no-commit - <<EOF > EOF applying patch from stdin abort: stdin: no diffs found [10] No dirstate backups are left behind $ ls .hg/dirstate* | sort .hg/dirstate