--- a/hgext/evolve.py	Sat Aug 08 12:42:57 2015 -0700
+++ b/hgext/evolve.py	Mon Aug 10 00:44:53 2015 -0700
@@ -2070,7 +2070,7 @@
         result = 1
     else:
         aspchildren = _aspiringchildren(repo, [repo['.'].rev()])
-        if not opts['evolve']:
+        if not opts['evolve'] or not aspchildren:
             ui.warn(_('no children\n'))
             if aspchildren:
                 msg = _('(%i unstable changesets to be evolved here, '

--- a/hgext/inhibit.py	Sat Aug 08 12:42:57 2015 -0700
+++ b/hgext/inhibit.py	Mon Aug 10 00:44:53 2015 -0700
@@ -166,7 +166,7 @@
     finally:
         lockmod.release(tr, lock)
 
-def transactioncallback(orig, repo, *args, **kwargs):
+def transactioncallback(orig, repo, desc, *args, **kwargs):
     """ Wrap localrepo.transaction to inhibit new obsolete changes """
     def inhibitposttransaction(transaction):
         # At the end of the transaction we catch all the new visible and
@@ -176,8 +176,9 @@
         visibleobsolete = list(r for r in visibleobsolete if r not in ignoreset)
         if visibleobsolete:
             _inhibitmarkers(repo, [repo[r].node() for r in visibleobsolete])
-    transaction = orig(repo, *args, **kwargs)
-    transaction.addpostclose('inhibitposttransaction', inhibitposttransaction)
+    transaction = orig(repo, desc, *args, **kwargs)
+    if desc != 'strip':
+        transaction.addpostclose('inhibitposttransaction', inhibitposttransaction)
     return transaction
 
 def extsetup(ui):

--- a/tests/test-prev-next.t	Sat Aug 08 12:42:57 2015 -0700
+++ b/tests/test-prev-next.t	Mon Aug 10 00:44:53 2015 -0700
@@ -137,6 +137,9 @@
   $ hg next
   no children
   [1]
+  $ hg next --evolve
+  no children
+  [1]
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [1] added b