# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1575655980 -19800
# Node ID 1eab41625dee20f6e6e161d6584d25f47df28556
# Parent  2928f35023a1bc20ca546a172389eee8e55cf399
evolve: abort if deciding resolution parent is ambiguous

While solving content-divergence, it could be hard to decide
which cset should be treated as a resolution parent if there
are multiple successors of divergent cset. i.e split case.

But we are planning to make some update in handling this split
case:
1) consider highest one if all splitted csets are in a single
topological branch
2) still need to decide if 1) doesn't apply

diff -r 2928f35023a1 -r 1eab41625dee hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Sat Nov 23 16:17:04 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Dec 06 23:43:00 2019 +0530
@@ -504,7 +504,8 @@
     try:
         succsdivp1 = utility._singlesuccessor(repo, divergent.p1())
     except utility.MultipleSuccessorsError:
-        succsdivp1 = divergent.p1().rev()
+        msg = _(b"ambiguous orphan resolution parent for %b")
+        raise error.Abort(msg % divergent.hex()[:12])
     # relocate divergent cset to its obsolete parent's successsor
     if succsdivp1 != divergent.p1().rev():
         ui.status(_(b'rebasing "divergent" content-divergent changeset %s on'