Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Wed, 27 Jun 2012 15:10:59 +0200
changeset 326 52c53e2d413b
parent 325 43a686709ded
child 327 c017ad874dfc
child 331 b230da8bc498
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.
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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])
evolve