# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1595441424 -19800
# Node ID d60490a2831898a4a9cba2bc52f0745412ef73f4
# Parent  d542e9720b1e735fb68a2c81b82d2b9c09d33477
evolve: improve warning msg when skipping orphan resolution

diff -r d542e9720b1e -r d60490a28318 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Wed Jul 22 23:37:59 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Jul 22 23:40:24 2020 +0530
@@ -119,7 +119,7 @@
             keepbranch = orig.p2().branch() != orig.branch()
 
     if not pctx.obsolete():
-        ui.warn(_(b"cannot solve instability of %s, skipping\n") % orig)
+        ui.warn(_(b"skipping %s, consider including orphan ancestors\n") % orig)
         return (False, b".")
     obs = pctx
     try:
diff -r d542e9720b1e -r d60490a28318 tests/test-evolve-order.t
--- a/tests/test-evolve-order.t	Wed Jul 22 23:37:59 2020 +0530
+++ b/tests/test-evolve-order.t	Wed Jul 22 23:40:24 2020 +0530
@@ -199,7 +199,7 @@
   $ echo "(desc(_d)::) - desc(c3_)"
   (desc(_d)::) - desc(c3_)
   $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
-  cannot solve instability of d096a2437fd0, skipping
+  skipping d096a2437fd0, consider including orphan ancestors
   move:[20] add c2prime
   atop:[21] add c1second
   move:[25] add b4_
diff -r d542e9720b1e -r d60490a28318 tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Jul 22 23:37:59 2020 +0530
+++ b/tests/test-evolve.t	Wed Jul 22 23:40:24 2020 +0530
@@ -1231,7 +1231,7 @@
   abort: cannot specify both "--rev" and "--any"
   [255]
   $ hg evolve --rev 89e4f7e8feb5
-  cannot solve instability of 89e4f7e8feb5, skipping
+  skipping 89e4f7e8feb5, consider including orphan ancestors
 
 Check that uncommit respects the allowunstable option
 With only createmarkers we can only uncommit on a head
diff -r d542e9720b1e -r d60490a28318 tests/test-issue-6028.t
--- a/tests/test-issue-6028.t	Wed Jul 22 23:37:59 2020 +0530
+++ b/tests/test-issue-6028.t	Wed Jul 22 23:40:24 2020 +0530
@@ -166,4 +166,4 @@
 evolve creates an obsolete changeset above as 11
 
   $ hg evolve -r .
-  cannot solve instability of c920dd828523, skipping
+  skipping c920dd828523, consider including orphan ancestors