Active6 months ago
Friends,I try to create a patch file and then apply the patch. ./uboot-imx/common/cli_readline.c is original, and ./dw/cli_readline.c is the modified.
Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored - saving rejects to file glib/gbacktrace.c.rej patching file glib/giowin32.c Reversed (or previously applied) patch detected! Skipping patch. 7 out of 7 hunks ignored - saving rejects to file glib/giowin32.c.rej patching file glib/gmessages.c Reversed (or. 最初からリバースパッチとわかっている場合は、-r オプションを付けることで Reversed (or previously applied) patch detected!
diff -u ./uboot-imx/common/cli_readline.c ./dw/cli_readline.c >diff.patch
cat diff.patch
/* apply patch */
patch -p0< diff.patch
patching file ./dw/cli_readline.c
Reversed (or previously applied) patch detected! Assume -R? [n]
2 questions:
- I was expect apply patch to ./uboot-imx/common/cli_readline.c but instead, it try to apply patch to ./dw/cli_readline.c
- ./dw/cli_readline.c never patched. why it says patch detected?
please give me advance.
thanks
user1932637user1932637
1 Answer
spend hours figured out the issue.I (maybe most of guys) thought patch take the '---dir/org_file' in patch file as the file to apply patch. indeed, that is wrong. in my case above, it take the second filestart with '+++' as file to apply patch.
rm ./dw/cli_readline.cthen apply patch. issue is gone
user1932637user1932637
Not the answer you're looking for? Browse other questions tagged linuxdiffpatch or ask your own question.
Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.
Sign upHave a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Comments
commented Sep 9, 2017 • edited
edited
While installing boost 1.55 get: EDIT: 1.57 doesn't have this issue. |
commented Sep 9, 2017
I added the first fix in 1128922. However, later, @hartzell added the same patch in 18c7e96 without realizing it. Essentially, we just need to leave a single patch and make certain of the exact boost and gcc versions for it. |
commented Sep 9, 2017
thanks for info. I wonder if I haven't enabled +python then why python_jam_pre156.patch getting applied:Seems like many older versions are not installable now. |
commented Sep 9, 2017 • edited
edited
@pramodskumbhar Regarding python, I thinks this is a second bug, and the code should be changed to |
commented Sep 12, 2017
@junghans: does @aprokop's fix address #5341? |
commented Sep 12, 2017
![Patch Patch](https://www.crifan.com/files/pic/uploads/2013/08/for-assume-r-first-n-then-y-can-continue_thumb.png)
@tgamblin: I think it solves 50% of the issue. I didn't run into the problem with python_jam*.patch . |
commented Nov 23, 2017
Apparently fixed by #5934 |
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment