equal
deleted
inserted
replaced
479 if dopatch: |
479 if dopatch: |
480 try: |
480 try: |
481 ui.debug(_('applying patch\n')) |
481 ui.debug(_('applying patch\n')) |
482 ui.debug(fp.getvalue()) |
482 ui.debug(fp.getvalue()) |
483 pfiles = {} |
483 pfiles = {} |
484 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles) |
484 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles, |
|
485 eolmode=None) |
485 patch.updatedir(ui, repo, pfiles) |
486 patch.updatedir(ui, repo, pfiles) |
486 except patch.PatchError, err: |
487 except patch.PatchError, err: |
487 s = str(err) |
488 s = str(err) |
488 if s: |
489 if s: |
489 raise util.Abort(s) |
490 raise util.Abort(s) |