From: Junio C Hamano <gitster@pobox.com>
To: Dmitri Pissarenko <dmitri.pissarenko@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git: patch does not apply
Date: Wed, 26 Jan 2011 09:43:35 -0800 [thread overview]
Message-ID: <7vei7zlfw8.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTi=ujfX53PXsfQXKf+1d5WQP=zMtzhKG-PSzT2_s@mail.gmail.com> (Dmitri Pissarenko's message of "Wed\, 26 Jan 2011 13\:41\:54 +0100")
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.
prev parent reply other threads:[~2011-01-26 17:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-26 12:41 git: patch does not apply Dmitri Pissarenko
2011-01-26 17:43 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vei7zlfw8.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=dmitri.pissarenko@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).