# HG changeset patch # User Pierre-Yves David # Date 1597420993 -7200 # Node ID 9920e8b4756df3ee6c5b2f4bc2021fb628086a1b # Parent 7c543787d5c6299d948dbc768ede2b7578ab41d8 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 diff -r 7c543787d5c6 -r 9920e8b4756d docs/troubles-handling.rst --- 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 ##################