comparison docs/troubles-handling.rst @ 5784:43a5371fa669

divergence-resolution: add support and doc for a special case in divergence

Changes in troubles-handling.rst explains the special case in details and
also speak about what is the default behavior and how to change it.

5783:c5c879fed91c

D-A3.1: one side moved
""""""""""""""""""""""

Set the parent of moved changeset as resolution parent.

D-A3.2: both moved forward; same branch
"""""""""""""""""""""""""""""""""""""""

Set the parent of ahead one as resolution parent.
As most obvious is that, ahead one has the latest changes.

5784:43a5371fa669

D-A3.1: one side moved
""""""""""""""""""""""

Set the parent of moved changeset as resolution parent.

Special-case: When parent of moved one is obsolete with a successor
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
By default, evolution will set the successor of obsolete parent as resolution
parent and will relocate both the divergent cset on it to perform 3-way merge.
But if the following config is set to True, it will set the obsolete parent as
resolution parent, so now resolved cset will be orphan, as it will be based on
the obsolete parent. Some users might not like the evolve to automatically
resovle this orphan instability as well (while they only wanted to resolve the
divergence), which is why we are providing this config.

`experimental.evolution.divergence-resolution-minimal=False(default)`

(The default resolution that automatically evolve the orphan instability as well
seems the best approach for now, but let's also gather user feedback, then we can decide accordingly)

D-A3.2: both moved forward; same branch
"""""""""""""""""""""""""""""""""""""""

Set the parent of ahead one as resolution parent.
As most obvious is that, ahead one has the latest changes.