Hi,
actually not.
Could you just upload the entire branch with those changes and I will have a look at it?
Best, -Michael
On Thu, 2016-08-18 at 18:07 +0200, Matthias Fischer wrote:
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@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