equal
deleted
inserted
replaced
505 '''Apply patchfile to the working directory. |
505 '''Apply patchfile to the working directory. |
506 patchfile: name of patch file''' |
506 patchfile: name of patch file''' |
507 files = {} |
507 files = {} |
508 try: |
508 try: |
509 fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
509 fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
510 files=files) |
510 files=files, eolmode=None) |
511 except Exception, inst: |
511 except Exception, inst: |
512 self.ui.note(str(inst) + '\n') |
512 self.ui.note(str(inst) + '\n') |
513 if not self.ui.verbose: |
513 if not self.ui.verbose: |
514 self.ui.warn(_("patch failed, unable to continue (try -v)\n")) |
514 self.ui.warn(_("patch failed, unable to continue (try -v)\n")) |
515 return (False, files, False) |
515 return (False, files, False) |