Mercurial > hg
comparison hgext/record.py @ 14370:17cea10c343e
patch: add a workingbackend dirstate layer on top of fsbackend
_updatedir() is no longer used by internalpatch()
The change in test-mq-missingfiles.t comes from workingbackend not considering
the missing 'b' file as changed, thus not calling addremove() on it.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 18 May 2011 23:48:17 +0200 |
parents | 00a881581400 |
children | 51cabd567ac6 |
comparison
equal
deleted
inserted
replaced
14369:f8932d540088 | 14370:17cea10c343e |
---|---|
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 patch.internalpatch(ui, repo, fp, 1, repo.root, | 480 patch.internalpatch(ui, repo, fp, 1, eolmode=None) |
481 eolmode=None) | |
482 except patch.PatchError, err: | 481 except patch.PatchError, err: |
483 raise util.Abort(str(err)) | 482 raise util.Abort(str(err)) |
484 del fp | 483 del fp |
485 | 484 |
486 # 4. We prepared working directory according to filtered | 485 # 4. We prepared working directory according to filtered |