From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squid 3.5.20: latest patches from upstream
Date: Thu, 18 Aug 2016 18:07:04 +0200
Message-ID: <35525ab4-cf59-0f60-38f0-fc54451ac459@ipfire.org>
In-Reply-To: <1470221229.2710.433.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7795922899236343260=="
List-Id: <development.lists.ipfire.org>

--===============7795922899236343260==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Hi,

On 03.08.2016 12:47, Michael Tremer wrote:
> Hi,
> 
> I didn't check the source, yet because it fails to apply before that:
> 
> [root(a)rice-oxley ipfire-2.x]# pwclient git-am -s 692
> Applying patch #692 using 'git am -s'
> Description: squid 3.5.20: latest patches from upstream
> Applying: squid 3.5.20: latest patches from upstream
> .git/rebase-apply/patch:50: trailing whitespace.
> # 
> .git/rebase-apply/patch:57: trailing whitespace.
>  
> .git/rebase-apply/patch:73: trailing whitespace.
>  
> .git/rebase-apply/patch:81: trailing whitespace.
>  
> .git/rebase-apply/patch:107: trailing whitespace.
>  
> error: patch failed: lfs/squid:70
> error: lfs/squid: patch does not apply
> Patch failed at 0001 squid 3.5.20: latest patches from upstream
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 'git am' failed with exit status 128
> ...

Being curious:
Anything new about this problem?

I doublechecked my sources - here its building without any problems.

Best,
Matthias


--===============7795922899236343260==--