Commit b711f72a authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

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

parent 72a4aa791d97
......@@ -92,25 +92,45 @@ Good: current implementation is expected to perform the planned 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).
In some cases, there can be multiple "not-pruned" ancestor and it could be ambiguous
for us to decide which one to pick.
XXX what about if they are multiple heads to that set of "not-pruned" ancestor?
Especially when they are more then 2 ?
O-A2.1: set of "not-pruned" ancestor has single head
""""""""""""""""""""""""""""""""""""""""""""""""""""
**Stabilisation Strategy**
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-A2.2: set of "not-pruned" ancestor has multiple heads
"""""""""""""""""""""""""""""""""""""""""""""""""""""""
O-A3: parent has multiple successors sets
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment