Mercurial > hg > mutable-history

changeset 326:52c53e2d413b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 27 Jun 2012 15:10:59 +0200
parents 43a686709ded
children c017ad874dfc b230da8bc498
files hgext/evolve.py
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -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])