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.
evolve: update evolve merge message
authorPierre-Yves David <pierre-yves.david@fb.com>
Tue, 30 Sep 2014 10:27:11 -0500
changeset 1116 d4977b04ef98
parent 1114 5d574b92203c
child 1117 98f4e356a431
evolve: update evolve merge message People are apparently unaware of --succ
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Mon Sep 22 17:27:57 2014 -0700
+++ b/hgext/evolve.py	Tue Sep 30 10:27:11 2014 -0500
@@ -779,7 +779,7 @@
     if not orig.p2().rev() == node.nullrev:
         raise util.Abort(
             'no support for evolving merge changesets yet',
-            hint="Redo the merge and use `hg prune` to obsolete the old one")
+            hint="Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one")
     destbookmarks = repo.nodebookmarks(dest.node())
     nodesrc = orig.node()
     destphase = repo[nodesrc].phase()
evolve