From: Larsen <larsen007@web.de>
To: development@lists.ipfire.org
Subject: Re: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
Date: Tue, 02 Jun 2015 23:07:48 +0200 [thread overview]
Message-ID: <op.xzmfnanpcahio0@honk.fritz.box> (raw)
In-Reply-To: <op.xzmfiwcucahio0@honk.fritz.box>
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
On Tue, 02 Jun 2015 23:05:10 +0200, Larsen <larsen007(a)web.de> wrote:
> On Tue, 02 Jun 2015 22:01:18 +0200, Michael Tremer <michael.tremer(a)ipfire.org> wrote:
>
>> Hi,
>>
>> this patch looks okay, but it won't apply. Git error:
>>
>> Applying: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
>> error: patch failed: html/cgi-bin/pppsetup.cgi:793
>> error: html/cgi-bin/pppsetup.cgi: patch does not apply
>> error: patch failed: langs/de/cgi-bin/de.pl:1822
>> error: langs/de/cgi-bin/de.pl: patch does not apply
>> error: patch failed: langs/en/cgi-bin/en.pl:1852
>> error: langs/en/cgi-bin/en.pl: patch does not apply
>> Patch failed at 0001 Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
>>
>> This is probably caused by copy-and-paste and replacing tabs by spaces
>> or similar.
>
(now again without hitting Ctrl+Enter too early... damn)
I saved the patch from your last reply and compared it to the original patch file
that was created by TortoiseGit. There were no differences.
I also patched pppsetup.cgi in my VM with Core 90 (didn´t try for the lang files)
and this also went fine.
There are no tabs in the patch.
I don´t know what could be wrong with it... =(
next prev parent reply other threads:[~2015-06-02 21:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1433079323.3370.92.camel@ipfire.org>
2015-06-01 20:59 ` Larsen
2015-06-01 21:57 ` Aw: " Bernhard Bitsch
2015-06-02 6:58 ` Larsen
2015-06-02 8:51 ` Aw: " Bernhard Bitsch
2015-06-02 10:04 ` Larsen
2015-06-02 19:49 ` Larsen
2015-06-02 20:01 ` Michael Tremer
2015-06-02 21:05 ` Larsen
2015-06-02 21:07 ` Larsen [this message]
2015-06-04 16:23 ` Michael Tremer
2015-06-04 20:52 ` Problem with whitespace in patches Larsen
2015-06-05 13:25 ` Michael Tremer
2015-06-05 13:29 ` Larsen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=op.xzmfnanpcahio0@honk.fritz.box \
--to=larsen007@web.de \
--cc=development@lists.ipfire.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox