equal
deleted
inserted
replaced
495 ui.debug('applying patch\n') |
495 ui.debug('applying patch\n') |
496 ui.debug(fp.getvalue()) |
496 ui.debug(fp.getvalue()) |
497 pfiles = {} |
497 pfiles = {} |
498 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles, |
498 patch.internalpatch(fp, ui, 1, repo.root, files=pfiles, |
499 eolmode=None) |
499 eolmode=None) |
500 patch.updatedir(ui, repo, pfiles) |
500 cmdutil.updatedir(ui, repo, pfiles) |
501 except patch.PatchError, err: |
501 except patch.PatchError, err: |
502 s = str(err) |
502 s = str(err) |
503 if s: |
503 if s: |
504 raise util.Abort(s) |
504 raise util.Abort(s) |
505 else: |
505 else: |