hgext/patchbomb.py
changeset 32715 0841382d114a
parent 32662 c2fe2b00db53
child 32843 d3b2d4587e73
equal deleted inserted replaced
32714:3ef319e9505f 32715:0841382d114a
   557         raise error.Abort(_('specify at least one changeset with -B, -r or -o'))
   557         raise error.Abort(_('specify at least one changeset with -B, -r or -o'))
   558 
   558 
   559     if outgoing and bundle:
   559     if outgoing and bundle:
   560         raise error.Abort(_("--outgoing mode always on with --bundle;"
   560         raise error.Abort(_("--outgoing mode always on with --bundle;"
   561                            " do not re-specify --outgoing"))
   561                            " do not re-specify --outgoing"))
       
   562     if rev and bookmark:
       
   563         raise error.Abort(_("-r and -B are mutually exclusive"))
   562 
   564 
   563     if outgoing or bundle:
   565     if outgoing or bundle:
   564         if len(revs) > 1:
   566         if len(revs) > 1:
   565             raise error.Abort(_("too many destinations"))
   567             raise error.Abort(_("too many destinations"))
   566         if revs:
   568         if revs: