Mercurial > hg
comparison hgext/record.py @ 14258:50e3fb2ab9fa
record: unconditionally update the working dir after patching
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 08 May 2011 17:48:29 +0200 |
| parents | f4e4faa92939 |
| children | df9ccd39828c |
comparison
equal
deleted
inserted
replaced
| 14257:d035ede73434 | 14258:50e3fb2ab9fa |
|---|---|
| 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 pfiles = {} |
| 481 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles, | 481 try: |
| 482 eolmode=None) | 482 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles, |
| 483 cmdutil.updatedir(ui, repo, pfiles) | 483 eolmode=None) |
| 484 finally: | |
| 485 cmdutil.updatedir(ui, repo, pfiles) | |
| 484 except patch.PatchError, err: | 486 except patch.PatchError, err: |
| 485 raise util.Abort(str(err)) | 487 raise util.Abort(str(err)) |
| 486 del fp | 488 del fp |
| 487 | 489 |
| 488 # 4. We prepared working directory according to filtered | 490 # 4. We prepared working directory according to filtered |