mercurial/commands.py
changeset 22277 e116abad3afa
parent 22274 10e87c67f1c7
child 22305 bdc0e04df243
equal deleted inserted replaced
22276:b13b99d39a46 22277:e116abad3afa
  3878         raise util.Abort(_('similarity must be a number'))
  3878         raise util.Abort(_('similarity must be a number'))
  3879     if sim < 0 or sim > 100:
  3879     if sim < 0 or sim > 100:
  3880         raise util.Abort(_('similarity must be between 0 and 100'))
  3880         raise util.Abort(_('similarity must be between 0 and 100'))
  3881     if sim and not update:
  3881     if sim and not update:
  3882         raise util.Abort(_('cannot use --similarity with --bypass'))
  3882         raise util.Abort(_('cannot use --similarity with --bypass'))
       
  3883     if opts.get('exact') and opts.get('edit'):
       
  3884         raise util.Abort(_('cannot use --exact with --edit'))
  3883 
  3885 
  3884     if update:
  3886     if update:
  3885         cmdutil.checkunfinished(repo)
  3887         cmdutil.checkunfinished(repo)
  3886     if (opts.get('exact') or not opts.get('force')) and update:
  3888     if (opts.get('exact') or not opts.get('force')) and update:
  3887         cmdutil.bailifchanged(repo)
  3889         cmdutil.bailifchanged(repo)