changeset 25452 | 43906060a3f4 |
parent 25450 | 7e36c3000ead |
child 25660 | 328739ea70c3 |
--- a/hgext/histedit.py Fri Jun 05 15:06:58 2015 -0400 +++ b/hgext/histedit.py Fri Jun 05 15:20:33 2015 -0400 @@ -433,6 +433,10 @@ ctxs = list(repo.set('%d::%d', first, last)) if not ctxs: return None + for c in ctxs: + if not c.mutable(): + raise util.Abort( + _("cannot fold into public change %s") % node.short(c.node())) base = first.parents()[0] # commit a new version of the old changeset, including the update