mercurial/commands.py
changeset 14564 65f4512e40e4
parent 14557 f966979f61ce
child 14604 b1a534335548
equal deleted inserted replaced
14563:81fc9678b018 14564:65f4512e40e4
  3104                 except error.RepoError:
  3104                 except error.RepoError:
  3105                     pass
  3105                     pass
  3106             if opts.get('exact') or opts.get('import_branch'):
  3106             if opts.get('exact') or opts.get('import_branch'):
  3107                 repo.dirstate.setbranch(branch or 'default')
  3107                 repo.dirstate.setbranch(branch or 'default')
  3108 
  3108 
  3109             files = {}
  3109             files = set()
  3110             patch.patch(ui, repo, tmpname, strip=strip, files=files,
  3110             patch.patch(ui, repo, tmpname, strip=strip, files=files,
  3111                         eolmode=None, similarity=sim / 100.0)
  3111                         eolmode=None, similarity=sim / 100.0)
  3112             files = list(files)
  3112             files = list(files)
  3113             if opts.get('no_commit'):
  3113             if opts.get('no_commit'):
  3114                 if message:
  3114                 if message: