This is the mail archive of the cygwin mailing list for the Cygwin project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

How to resolve hiccups by patch program?


I published the file "const4.patch" ( to fix something for the issue "Improve const-correctness" ( Unfortunately, some errors were reported for this patch file. There are parts that are acceptable as it can be seen from the log "bug 8160 const4 patch results.txt". So I extracted a conflicting part by the splitdiff command.

I've got this annoying issue with the tool (version 2.5.9):
$ patch -r test8160.rej app_db.c const4.patch.part010
patching file app_db.c
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- saving rejects to file test8160.rej

Why are the appropriate places for the intended updates not found in the source code?
Do I overlook anything from the specified rules that results into the unexpected mismatch?

I assume that I am not affected by wrong line endings as it was suggested for the topic 'Is "Patch" broken?'.

Is the conclusion from the topic "Where is patch?" relevant in my case?

Would you like to share your ideas in other discussions?


Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]