Mercurial > evolve
comparison tests/test-evolve-issue5967.t @ 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 | e78926a1a473 |
| children | 417503ef667d |
comparison
equal
deleted
inserted
replaced
| 5174:9b8d4403b735 | 5175:307bb57ff2ce |
|---|---|
| 67 | | 67 | |
| 68 x 3ba7db0ce860 (0) apple | 68 x 3ba7db0ce860 (0) apple |
| 69 rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 69 rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 70 | 70 |
| 71 $ hg olog --hidden --all 1 | 71 $ hg olog --hidden --all 1 |
| 72 % dd9b5dd30cd6 (1) banana | 72 x dd9b5dd30cd6 (1) banana |
| 73 pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 73 pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
| 74 | 74 |