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

Augie Fackler raf at durin42.com
Tue Jun 6 10:18:13 EDT 2017


On Tue, Jun 06, 2017 at 03:05:04PM +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

I've queued this one, but the other two patches both do not apply and
I can't find the parent listed in the header of patch 1 to try
applying there and then rebasing.

>
> 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"))
>
>      if outgoing or bundle:
>          if len(revs) > 1:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list