[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [bug-patch] Patch Apply Failed
|
From: |
Andreas Grünbacher |
|
Subject: |
Re: [bug-patch] Patch Apply Failed |
|
Date: |
Thu, 20 Jun 2013 15:04:15 +0200 |
2013/6/20 Farzaneh Sabzi <address@hidden>:
> I was trying to apply a patch to a file (the attachments) and I received
> this error :
>
> patch -t FlatFileItemWriter.java < option4transactional.diff
>
> patching file FlatFileItemWriter.java
> Hunk #1 FAILED at 254.
> 1 out of 1 hunk FAILED -- saving rejects to file FlatFileItemWriter.java.rej
> patching file FlatFileItemWriter.java
> Assertion failed: hunk, file ../patch-2.5.9-src/patch.c, line 354
I don't get the assertion failure, the patch still doesn't apply
though. The reason is because the .java file uses Windows-style line
endings (CRLF) while the patch expects a UNIX-style file (it uses CRLF
line endings in the headers and LF line endings in the actual hunks).
Even when that is fixed, only part of the patch applies, though.
Andreas