Patchwork patchbomb: avoid -r and -B options at the same time

login
register
mail settings
Submitter David Demelier
Date June 7, 2017, 7:02 a.m.
Message ID <887ff591e28b2b369a92.1496818955@localhost.localdomain>
Download mbox | patch
Permalink /patch/21233/
State Superseded
Headers show

Comments

David Demelier - June 7, 2017, 7:02 a.m.
# HG changeset patch
# User David Demelier <demelier.david@gmail.com>
# Date 1496731971 -7200
#      Tue Jun 06 08:52:51 2017 +0200
# Node ID 887ff591e28b2b369a921c083bef792352989c59
# Parent  42130f45d016cb01228c8b9e8564af987f9705ff
patchbomb: avoid -r and -B options at the same time

Patch

diff -r 42130f45d016 -r 887ff591e28b hgext/patchbomb.py
--- a/hgext/patchbomb.py	Fri Feb 03 15:02:27 2017 +0100
+++ 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: