equal
deleted
inserted
replaced
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 |