git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git: patch does not apply

From
DPDmitri Pissarenko <dmitri.pissarenko@gmail.com>
Date
Jan 26, 2011, 12:41 UTC
Message-ID
<AANLkTi=ujfX53PXsfQXKf+1d5WQP=zMtzhKG-PSzT2_s@mail.gmail.com>
Hello!
I have a certain patch called my_pcc_branch.patch.
When I try to apply it, I get following message:

$ git apply --check my_pcc_branch.patch warning: src/main/java/.../AbstractedPanel.java has type 100644, expected 100755 error: patch failed: src/main/java/.../AbstractedPanel.java:13 error: src/main/java/.../AbstractedPanel.java: patch does not apply

What does it mean?
How can I fix this problem?
Notes:
1) I posted this question on StackOverflow and tried out several
things suggested there.
http://stackoverflow.com/questions/4770177/git-patch-does-not-apply
However, I don't have a working solution yet.
2) I'm using git 1.7.3.1.mysgit.0 under Windows 7. The author of the
patch uses Windows XP.
Thanks in advance
Dmitri
Next: Junio C Hamano
Message 1 of 2 in “git: patch does not apply”
  1. Dmitri PissarenkoJan 26, 2011
  2. Junio C HamanoJan 26, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.