Mercurial > evolve
comparison CHANGELOG @ 4689:27947b17cfaf stable
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 | 313565dd75e3 |
| children | a9cf0ba6e6c7 |
comparison
equal
deleted
inserted
replaced
| 4688:75329efe56a9 | 4689:27947b17cfaf |
|---|---|
| 3 | 3 |
| 4 9.0.1 - in progress | 4 9.0.1 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * pick: no longer forget file in case of conflict (issue6037) | 7 * pick: no longer forget file in case of conflict (issue6037) |
| 8 * evolve: properly prune changeset with no change in case of conflict (issue5967) | |
| 8 | 9 |
| 9 9.0.0 -- 2019-06-06 | 10 9.0.0 -- 2019-06-06 |
| 10 ------------------- | 11 ------------------- |
| 11 | 12 |
| 12 * evolve: preserve the working directory after resolving instability (BC) | 13 * evolve: preserve the working directory after resolving instability (BC) |