# HG changeset patch # User Pierre-Yves David # Date 1597421410 -7200 # Node ID 381df06460e855b12332443704701a145d47a7c1 # Parent 457d8003e84032f3f227806ac3d7df900a770f15 unstable-list: add list the source of complexity during resolution All I and Sushil could think about. diff -r 457d8003e840 -r 381df06460e8 docs/troubles-handling.rst --- a/docs/troubles-handling.rst Fri Aug 14 18:09:42 2020 +0200 +++ b/docs/troubles-handling.rst Fri Aug 14 18:10:10 2020 +0200 @@ -43,6 +43,22 @@ Source of Complexity ******************** +There can be different situations we need to take care of when dealing with +resolution of an orphan changeset, like: + +* parents might not be obsolete (yet) and orphan themself. They will need to be + resolved first. +* obsolete parent has conflicting rewrites (content-divergence), so there might + not be an obvious "good spot" to rebase the changeset too. +* obsolete parent could have been prune, so it has not direct successors, +* obsolete parent was split in multiple changesets. This comes with multiple + variants: + * successors could be linear of spread accross multiple branches, + * successors could have been reordered after the initial split, + * Some of the successors could have been pruned. +* the orphan changeset can be a merge and orphan may come any numbers of parents +* rebasing might lead to conflict. + Details of Sub cases ********************