Mercurial > evolve
changeset 5175:307bb57ff2ce
tests: adapt now that Mercurial clears the merge state for empty wdir
`hg evolve` forgot to clear the merge state when its attempt to commit
resulted in no commit because the working copy had no changes. That
resulted in test-evolve-issue5967.t showing a conflict state that
shouldn't be there. The responsibility for clearing the merge state
was moved into Mercurial in Mercurial in 6a34e438461b (commit: clear
resolved mergestate even if working copy is clean, 2020-02-28), so the
bug is now fixed in `hg evolve`, which impacts that test case.
CORE-TEST-OUTPUT-UPDATE: 6a34e438461b
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 04 Mar 2020 15:21:32 -0800 |
| parents | 9b8d4403b735 |
| children | b9af7b8f3eee |
| files | tests/test-evolve-issue5967.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-issue5967.t Fri Mar 06 21:37:28 2020 +0700 +++ b/tests/test-evolve-issue5967.t Wed Mar 04 15:21:32 2020 -0800 @@ -69,6 +69,6 @@ rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000) $ hg olog --hidden --all 1 - % dd9b5dd30cd6 (1) banana + x dd9b5dd30cd6 (1) banana pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)