Mercurial > hg
view tests/test-revert-unknown.t @ 45388:6ba7190ff863
commit: clear mergestate also with --amend (issue6304)
The `hg commit --amend` uses the in-memory code, which naturally
doesn't touch the merge state (well, it shouldn't anyway; I think I've
fixed bugs in that area recently). We therefore need to clear the
mergestate after calling `repo.commitctx()` since we expect that from
`hg commit --amend`.
Differential Revision: https://phab.mercurial-scm.org/D8932
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 18 Aug 2020 15:03:57 -0700 |
parents | 5c2a4f37eace |
children | 55c6ebd11cb9 |
line wrap: on
line source
$ hg init $ touch unknown $ touch a $ hg add a $ hg ci -m "1" $ touch b $ hg add b $ hg ci -m "2" Should show unknown $ hg status ? unknown $ hg revert -r 0 --all removing b Should show unknown and b removed $ hg status R b ? unknown Should show a and unknown $ ls -A .hg a unknown