[PATCH 2 of 3] patchbomb: avoid -r and -B options at the same time

Yuya Nishihara yuya at tcha.org
Wed Jun 7 08:53:59 EDT 2017


On Tue, 06 Jun 2017 15:05:04 +0200, David Demelier wrote:
> # HG changeset patch
> # User David Demelier <demelier.david at gmail.com>
> # Date 1496731971 -7200
> #      Tue Jun 06 08:52:51 2017 +0200
> # Node ID 421ba4fa3337f4bc9714473ca2f050f08d86bfb6
> # Parent  d32b943335c7e97fc6016063d5898b3b7a06519f
> patchbomb: avoid -r and -B options at the same time
> 
> diff -r d32b943335c7 -r 421ba4fa3337 hgext/patchbomb.py
> --- a/hgext/patchbomb.py	Tue Jun 06 08:50:30 2017 +0200
> +++ 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"))

Perhaps (rev or revs) and bookmark ?


More information about the Mercurial-devel mailing list