Show More
@@ -468,9 +468,16 b' def dorecord(ui, repo, committer, *pats,' | |||||
468 |
|
468 | |||
469 | # 3b. (apply) |
|
469 | # 3b. (apply) | |
470 | if dopatch: |
|
470 | if dopatch: | |
471 | ui.debug('applying patch\n') |
|
471 | try: | |
472 |
ui.debug( |
|
472 | ui.debug('applying patch\n') | |
473 | patch.internalpatch(fp, ui, 1, repo.root) |
|
473 | ui.debug(fp.getvalue()) | |
|
474 | patch.internalpatch(fp, ui, 1, repo.root) | |||
|
475 | except patch.PatchError, err: | |||
|
476 | s = str(err) | |||
|
477 | if s: | |||
|
478 | raise util.Abort(s) | |||
|
479 | else: | |||
|
480 | raise util.Abort(_('patch failed to apply')) | |||
474 | del fp |
|
481 | del fp | |
475 |
|
482 | |||
476 | # 4. We prepared working directory according to filtered patch. |
|
483 | # 4. We prepared working directory according to filtered patch. |
General Comments 0
You need to be logged in to leave comments.
Login now