# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1340802659 -7200
# Node ID 52c53e2d413bdf601fb97f1550f5889775a36808
# Parent  43a686709ded002e4ddaecb7236d2ddd6988e716
stabilize: clear error message than conflict during rebase offer no hope

The warning is big and ugly. It will be removed when stab handle that properly.

diff -r 43a686709ded -r 52c53e2d413b hgext/evolve.py
--- a/hgext/evolve.py	Wed Jun 27 14:48:44 2012 +0200
+++ b/hgext/evolve.py	Wed Jun 27 15:10:59 2012 +0200
@@ -166,8 +166,14 @@
         else:
             rebase.rebasenode(repo, orig.node(), dest.node(),
                               {node.nullrev: node.nullrev})
-        nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
-                                      node.nullid)
+        try:
+            nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
+                                          node.nullid)
+        except util.Abort:
+            repo.ui.write_err(_('/!\\ stabilize failed                          /!\\\n'))
+            repo.ui.write_err(_('/!\\ Their is no "hg stabilize --continue"     /!\\\n'))
+            repo.ui.write_err(_('/!\\ use "hg up -C . ; hg stabilize --dry-run" /!\\\n'))
+            raise
         oldbookmarks = repo.nodebookmarks(nodesrc)
         if nodenew is not None:
             phases.retractboundary(repo, destphase, [nodenew])