Mercurial > evolve
changeset 5488:9920e8b4756d
unstable-list: add a entry about pruned parent
We already fund some "not that simple case" to deal with. This needs to be split
in more subcase
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 14 Aug 2020 18:03:13 +0200 |
| parents | 7c543787d5c6 |
| children | 8b7036384f77 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Fri Aug 14 18:01:53 2020 +0200 +++ b/docs/troubles-handling.rst Fri Aug 14 18:03:13 2020 +0200 @@ -80,6 +80,24 @@ """"""""""""""""""""" Good: current implementation is expected to perform the planed stabilisation. + +O-A2: parent is pruned (no successors) +-------------------------------------- + + +Stabilisation Strategy +"""""""""""""""""""""" + +find nearest "not-pruned" ancestor and treat it (or its successor, if apply) as +a resolution parent. (re-run Orphan resolution starting from these parent). + +XXX what about if they are multiple heads to that set of "not-pruned" ancestor? +Especially when they are more then 2 ? + +Current Support Level +""""""""""""""""""""" + +Good support if there they are only one head to the set Phase-Divergence ##################