Re: git: patch does not apply

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 26, 2011, 17:43 UTC
Message-ID: <7vei7zlfw8.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTi=ujfX53PXsfQXKf+1d5WQP=zMtzhKG-PSzT2_s@mail.gmail.com>

Dmitri Pissarenko <dmitri.pissarenko@gmail.com> writes:

> 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

Whoever prepared the patch started off of the version of the file with executable bit dropped, while you still have a version with executable bit. This is a warning and is not a cause for the patch not applying.

> error: patch failed: src/main/java/.../AbstractedPanel.java:13
> error: src/main/java/.../AbstractedPanel.java: patch does not apply

The tool looked at around line 13 of the APanel.java file because the input, my_pcc_branch.patch, wanted to change things around there, but couldn't find corresponding preimage.

> What does it mean?

That is what it means.

> How can I fix this problem?

Look at the patch (find lines that perhaps begin with "@@ -13,something" after "diff --git a/...APanel.java b/...APanel.java" appears), look at the APanel.java file at around line 13, and see how they differ. Discern what the patch wanted to do, and make a corresponding edit to ...APanel.java file.