--- a/mercurial/commands.py Sat Sep 15 12:32:01 2018 +0900
+++ b/mercurial/commands.py Sat Sep 15 12:34:13 2018 +0900
@@ -980,8 +980,8 @@
raise error.Abort(_("--rev is incompatible with --%s") % action)
if names and action == 'active':
raise error.Abort(_("NAMES is incompatible with --active"))
- if inactive and action == 'active':
- raise error.Abort(_("--inactive is incompatible with --active"))
+ if inactive and action in {'delete', 'active'}:
+ raise error.Abort(_("--inactive is incompatible with --%s") % action)
if not names and action in {'add', 'delete'}:
raise error.Abort(_("bookmark name required"))