--- a/mercurial/rewriteutil.py Wed Nov 14 11:30:46 2018 -0800
+++ b/mercurial/rewriteutil.py Wed Nov 14 15:05:38 2018 +0800
@@ -27,10 +27,10 @@
hint = _("no changeset checked out")
raise error.Abort(msg, hint=hint)
- publicrevs = repo.revs('%ld and public()', revs)
if len(repo[None].parents()) > 1:
raise error.Abort(_("cannot %s while merging") % action)
+ publicrevs = repo.revs('%ld and public()', revs)
if publicrevs:
msg = _("cannot %s public changesets") % (action)
hint = _("see 'hg help phases' for details")