# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1602350064 -19800
# Node ID 5cbb1f356137882dca78a3fa155f07b8ea426448
# Parent  c2e71fc0efebc6434d1708892c7f3333e0360eea
unstable-list: add split and fold in content-divergence resolution

This patch adds the current status of divergence resolution when one of
the divergent changeset is a part of split or fold.

diff -r c2e71fc0efeb -r 5cbb1f356137 docs/troubles-handling.rst
--- a/docs/troubles-handling.rst	Tue Sep 22 13:50:45 2020 +0530
+++ b/docs/troubles-handling.rst	Sat Oct 10 22:44:24 2020 +0530
@@ -262,12 +262,19 @@
 * they moved on different unrelated branches
 * divergent changeset can be orphan as well
 * one side of divergence is in public phase
+* divergent changeset is part of a split or fold
 
 Details of resolution
 =====================
 
 Resolution of content-divergence can be understand by dividing it in stages:
 
+Special case: If one of the divergent changeset is part of a split or fold, we don't handle
+it right now. But when we are going to support it, it will probably have its own logic and
+seperate from generic resolution.
+
+Generic resolution:
+
 The first stage of solving content-divergence is to find the changeset where the resolution
 changeset will be based on (which we call the resolution parent or the target parent) and
 relocate the divergent changesets on the resolution parent, if apply.
@@ -282,6 +289,11 @@
 .. contents::
    :local:
 
+D-S: One of the divergent changeset is part of a split or fold
+--------------------------------------------------------------
+
+XXX: yet to decide resolution
+
 D-A: Finding the resolution parent
 ----------------------------------