diff -r 3a1988e915f9 -r 1474f5d84662 hgext/strip.py --- a/hgext/strip.py Mon Jun 17 10:40:24 2019 -0700 +++ b/hgext/strip.py Mon Jun 17 10:19:41 2019 -0700 @@ -50,15 +50,7 @@ cmdutil.checkunfinished(repo) s = repo.status() if not force: - if len(repo[None].parents()) > 1: - _("outstanding uncommitted merge") #i18 tool detection - raise error.Abort(_("outstanding uncommitted merge")) - if s.modified or s.added or s.removed or s.deleted: - _("local changes found") # i18n tool detection - raise error.Abort(_("local changes found")) - if checksubstate(repo): - _("local changed subrepos found") # i18n tool detection - raise error.Abort(_("local changed subrepos found")) + cmdutil.bailifchanged(repo) return s def _findupdatetarget(repo, nodes):