Mercurial > hg
changeset 32695:0841382d114a
patchbomb: avoid -r and -B options at the same time
author | David Demelier <demelier.david@gmail.com> |
---|---|
date | Tue, 06 Jun 2017 08:52:51 +0200 |
parents | 3ef319e9505f |
children | 0c09afdf5704 |
files | hgext/patchbomb.py |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/patchbomb.py Mon Jun 05 16:19:41 2017 -0700 +++ b/hgext/patchbomb.py Tue Jun 06 08:52:51 2017 +0200 @@ -559,6 +559,8 @@ 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: