# HG changeset patch # User Pierre-Yves David # Date 1597421062 -7200 # Node ID 8b7036384f770b19faef0d47db6a86309e64508d # Parent 9920e8b4756df3ee6c5b2f4bc2021fb628086a1b unstable-list: more entry for orphan SPLIT ME diff -r 9920e8b4756d -r 8b7036384f77 docs/troubles-handling.rst --- a/docs/troubles-handling.rst Fri Aug 14 18:03:13 2020 +0200 +++ b/docs/troubles-handling.rst Fri Aug 14 18:04:22 2020 +0200 @@ -98,6 +98,69 @@ """"""""""""""""""""" Good support if there they are only one head to the set + +O-A3: parent has multiple successors sets +----------------------------------------- + +Stabilisation Strategy +"""""""""""""""""""""" + +Current Support Level +""""""""""""""""""""" + +O-A4: parent is split into multiple successors +---------------------------------------------- + +O-A4.1: parent are all one the same topological branch +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Stabilisation Strategy +"""""""""""""""""""""" +pick highest one as resolution parent if all the succs are in a single topo branch + +Current Support Level +""""""""""""""""""""" + +O-A4.2: parent is split into multiple successors +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In this case, the destination can be ambiguous + +Stabilisation Strategy +"""""""""""""""""""""" + +prompt user to choose one + +(could we do better in some case?) + +Current Support Level +""""""""""""""""""""" + + +Stabilisation Strategy +"""""""""""""""""""""" +, otherwise prompt user to choose one + + + +Current Support Level +""""""""""""""""""""" + +O-M: Parent are Merge (multiple parent) +======================================= + +O-M1: Only one parent is obsolete +--------------------------------- + +XXX Simple case are probably as good as any `O-A` case. However special case are +probably ignored right now (eg: successors of the obsolete parent is linear with +the other parent). + +O-M2: both parent are obsolete +------------------------------ + +XXX currently we evolve one after the other. + Phase-Divergence ##################