Mercurial > evolve
comparison CHANGELOG @ 4311:8aa28e68ac44 stable
evolve: detect unresolved conflict during evolve --continue (issue5966)
Evolve --continue was ignoring unresolved conflict, proceeding with its
operation without any check. This is now fixed.
This test case was built and formalized by Matt Harbison and Anton Shestakov.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 21 Dec 2018 13:14:59 +0800 |
| parents | 699e25687cc5 |
| children | 97b18934d6db |
comparison
equal
deleted
inserted
replaced
| 4304:604732387e33 | 4311:8aa28e68ac44 |
|---|---|
| 2 ========= | 2 ========= |
| 3 | 3 |
| 4 8.3.3 - in progress | 4 8.3.3 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * evolve: properly detect unresolved merge conflict (issue-5966) | |
| 7 * evolve: fix possible crash when the repo changes during evolve (issue-6028) | 8 * evolve: fix possible crash when the repo changes during evolve (issue-6028) |
| 8 * test: avoid leaking `hg serve` process | 9 * test: avoid leaking `hg serve` process |
| 9 * topic: fix error message for the `ngtip` revset | 10 * topic: fix error message for the `ngtip` revset |
| 10 | 11 |
| 11 8.3.2 -- 2017-11-27 | 12 8.3.2 -- 2017-11-27 |