Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 14260:00a881581400
patch: make patch()/internalpatch() always update the dirstate
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 08 May 2011 17:48:31 +0200 |
| parents | df9ccd39828c |
| children | 4030630fb59c |
line wrap: on
line diff
--- a/mercurial/commands.py Sun May 08 17:48:30 2011 +0200 +++ b/mercurial/commands.py Sun May 08 17:48:31 2011 +0200 @@ -2623,12 +2623,9 @@ repo.dirstate.setbranch(branch or 'default') files = {} - try: - patch.patch(tmpname, ui, strip=strip, cwd=repo.root, - files=files, eolmode=None) - finally: - files = patch.updatedir(ui, repo, files, - similarity=sim / 100.0) + patch.patch(ui, repo, tmpname, strip=strip, cwd=repo.root, + files=files, eolmode=None, similarity=sim / 100.0) + files = list(files) if opts.get('no_commit'): if message: msgs.append(message)