changeset 5584:7f9149ccbf42

unstable-list: add new subsections for orphan when parent is pruned

--- a/docs/troubles-handling.rst	Sat Oct 10 14:04:02 2020 +0530
+++ b/docs/troubles-handling.rst	Sat Oct 10 14:04:11 2020 +0530
@@ -92,25 +92,45 @@
 O-A2: parent is pruned (no successors)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+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).
+In some cases, there can be multiple "not-pruned" ancestor and it could be ambiguous
+for us to decide which one to pick.
+
+O-A2.1: set of "not-pruned" ancestor has single head
+""""""""""""""""""""""""""""""""""""""""""""""""""""
+
 
 **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 ?
+This comes under `O-A3` and `O-A4` cases (since we re-run orphan resolution
+assuming "not-pruned" ancestor as parent)
 
 **Current Support Level**
 
-Good support if there is only one head to the set.
+Good: current implementation is expected to perform the planned stabilisation.
 
-O-A3: parent has multiple successors sets
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+O-A2.2: set of "not-pruned" ancestor has multiple heads
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+If a merge is pruned, we have multiple "not-pruned" ancestor for its immediate
+child to stabilise.
 
 
 **Stabilisation Strategy**
 
+XXX: yet to decide resolution
+
+**Current Support Level**
+
+O-A3: parent has multiple successors sets (divergence case)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+**Stabilisation Strategy**
+
+XXX: yet to decide resolution
+
 **Current Support Level**
 
 O-A4: parent is split into multiple successors