equal
deleted
inserted
replaced
1762 repo.dirstate.setbranch(branch or 'default') |
1762 repo.dirstate.setbranch(branch or 'default') |
1763 |
1763 |
1764 files = {} |
1764 files = {} |
1765 try: |
1765 try: |
1766 patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
1766 patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
1767 files=files) |
1767 files=files, eolmode=None) |
1768 finally: |
1768 finally: |
1769 files = patch.updatedir(ui, repo, files, similarity=sim/100.) |
1769 files = patch.updatedir(ui, repo, files, similarity=sim/100.) |
1770 if not opts.get('no_commit'): |
1770 if not opts.get('no_commit'): |
1771 m = cmdutil.matchfiles(repo, files or []) |
1771 m = cmdutil.matchfiles(repo, files or []) |
1772 n = repo.commit(message, opts.get('user') or user, |
1772 n = repo.commit(message, opts.get('user') or user, |