# HG changeset patch # User David Demelier # Date 2017-06-06 06:52:51 # Node ID 0841382d114ae0c246cb5862c929fe16041f308c # Parent 3ef319e9505f376775c91b2ab7d89ac9ac4343e9 patchbomb: avoid -r and -B options at the same time diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -559,6 +559,8 @@ def email(ui, repo, *revs, **opts): if outgoing and bundle: raise error.Abort(_("--outgoing mode always on with --bundle;" " do not re-specify --outgoing")) + if rev and bookmark: + raise error.Abort(_("-r and -B are mutually exclusive")) if outgoing or bundle: if len(revs) > 1: