Mercurial > hg
comparison hgext/record.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 | 17cea10c343e |
comparison
equal
deleted
inserted
replaced
| 14259:df9ccd39828c | 14260:00a881581400 |
|---|---|
| 475 # 3b. (apply) | 475 # 3b. (apply) |
| 476 if dopatch: | 476 if dopatch: |
| 477 try: | 477 try: |
| 478 ui.debug('applying patch\n') | 478 ui.debug('applying patch\n') |
| 479 ui.debug(fp.getvalue()) | 479 ui.debug(fp.getvalue()) |
| 480 pfiles = {} | 480 patch.internalpatch(ui, repo, fp, 1, repo.root, |
| 481 try: | 481 eolmode=None) |
| 482 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles, | |
| 483 eolmode=None) | |
| 484 finally: | |
| 485 patch.updatedir(ui, repo, pfiles) | |
| 486 except patch.PatchError, err: | 482 except patch.PatchError, err: |
| 487 raise util.Abort(str(err)) | 483 raise util.Abort(str(err)) |
| 488 del fp | 484 del fp |
| 489 | 485 |
| 490 # 4. We prepared working directory according to filtered | 486 # 4. We prepared working directory according to filtered |