Mercurial > evolve

comparison tests/test-evolve-issue5967.t @ 4689:27947b17cfaf stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: orphans that evolve into nothing don't need successors (issue5967) When continuing to solve an orphan that created no changes (i.e. clean wdir), _completeorphan() used to create an obsmarker that said that the result of that orphan evolution is the currently checked out changeset. That's not a correct obsmarker, because all of the orphan's changes were dropped and so it had no effect on the currently checked out changeset. This is an issue that has only existed when --continu'ing evolve, that's why the fix touches _completeorphan(), but not _solveunstable(). This fix is adapted from a similar "if node is None" block in _finalizerelocate().
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 18 Jun 2019 17:17:31 +0800
parents 75329efe56a9
children de194ed973ba
comparison
equal deleted inserted replaced
4688:75329efe56a9 4689:27947b17cfaf
56 evolution of 1:dd9b5dd30cd6 created no changes to commit 56 evolution of 1:dd9b5dd30cd6 created no changes to commit
57 working directory is now at 4d6fec23dcc4 57 working directory is now at 4d6fec23dcc4
58 $ hg glog 58 $ hg glog
59 @ 2: apricot 59 @ 2: apricot
60 60
61
62 This is important: 1 should not have a successor (especially not revision 2)
63
61 $ hg olog --all 64 $ hg olog --all
62 @ 4d6fec23dcc4 (2) apricot 65 @ 4d6fec23dcc4 (2) apricot
63 |\
64 x | 3ba7db0ce860 (0) apple
65 / rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
66 | 66 |
67 x dd9b5dd30cd6 (1) banana 67 x 3ba7db0ce860 (0) apple
68 rewritten(description, parent, content) as 4d6fec23dcc4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 68 rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
69 69
70 $ hg olog --hidden --all 1 70 $ hg olog --hidden --all 1
71 @ 4d6fec23dcc4 (2) apricot
72 |\
73 x | 3ba7db0ce860 (0) apple
74 / rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
75 |
76 x dd9b5dd30cd6 (1) banana 71 x dd9b5dd30cd6 (1) banana
77 rewritten(description, parent, content) as 4d6fec23dcc4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 72 pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
78 73