Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/rewriteutil.py
changeset 2784 d17d193c4145
parent 2783 3e9c3119410a
child 2785 b5a48e4aeec6 
--- a/hgext3rd/evolve/rewriteutil.py	Sun Jul 23 19:53:51 2017 +0200
+++ b/hgext3rd/evolve/rewriteutil.py	Sun Jul 23 19:45:28 2017 +0200
@@ -68,7 +68,8 @@
         raise error.Abort(msg, hint=hint)
     newunstable = disallowednewunstable(repo, revs)
     if newunstable:
-        msg = _("cannot fold chain not ending with a head or with branching")
+        msg = _("%s will orphan %i descendants")
+        msg %= (action, len(newunstable))
         hint = _("see 'hg help evolution.instability'")
         raise error.Abort(msg, hint=hint)
evolve