--- a/hgext3rd/evolve/rewriteutil.py
+++ b/hgext3rd/evolve/rewriteutil.py
@@ -31,6 +31,14 @@
     compat,
 )
 
+def precheck(repo, revs, action='rewrite'):
+    """check if <revs> can be rewritten
+
+    <action> can be used to control the commit message.
+    """
+    if repo.revs('%ld and public()', revs):
+        raise error.Abort(_("cannot %s public revisions") % action)
+
 def bookmarksupdater(repo, oldid, tr):
     """Return a callable update(newid) updating the current bookmark
     and bookmarks bound to oldid to newid.
@@ -54,6 +62,7 @@
 
 def foldcheck(repo, revs):
     """check that <revs> can be folded"""
+    precheck(repo, revs, action='fold')
     roots = repo.revs('roots(%ld)', revs)
     if len(roots) > 1:
         raise error.Abort(_("cannot fold non-linear revisions "