On Thu, Jan 21, 2016 at 10:54 PM, Magnus Hagander <magnus@hagander.net> wrote:
>
>
> On Thu, Jan 21, 2016 at 11:35 PM, Andreas 'ads' Scherbaum
> <adsmail@wars-nicht.de> wrote:
>>
>> On 21.01.2016 10:31, Dave Page wrote:
>>>
>>> On Tue, Jan 19, 2016 at 10:54 PM, Andreas 'ads' Scherbaum
>>> <adsmail@wars-nicht.de> wrote:
>>>>
>>>> On 19.01.2016 16:03, Dave Page wrote:
>>>>>
>>>>>
>>>>>
>>>>> Your patch won't apply again. I have no idea why - I'm trying to do it
>>>>> on my Mac, which is a *nix under the hood (they don't use Mac line
>>>>> endings any more - that was the old Mac OS 9 and earlier from a decade
>>>>> or so ago iirc). How are you creating them? The normal way is to do
>>>>> something like:
>>>>
>>>>
>>>>
>>>> And how does the attached work? Fresh clone again, only difference is a
>>>> warning (not an error) for whitespaces removed.
>>>
>>>
>>> Still doesn't apply. I tried on the following systems:
>>>
>>> Mac OS X 10.11.1 - git version 2.5.4 (Apple Git-61)
>>> Windows 7 Enterprise SP1 - git version 1.8.1.msysgit.1
>>> CentOS release 6.7 (Final) - git version 1.7.1
>>>
>>> I'm fairly convinced at this stage that there's something funky on
>>> your system. Perhaps we should take a look next week when we're both
>>> in Brussels?
>>>
>>
>> After debugging back and forth with Magnus, it looks like that Google Mail
>> is fooling you. Your downloaded file has a different line ending, and your
>> file is 3269 bytes, where the original file is 3210 bytes. That's 59
>> additional line breaks.
>>
>> 4fa0990a1020e425fe95b99ea9f186de gp-warning2.diff
>>
>> The file you download from the archive:
>>
>> http://www.postgresql.org/message-id/569EBEA2.5040903@wars-nicht.de
>>
>> is also correct.
Well that's weird. But why is it only happening with your patches? I
apply patches from others constantly without issues.
> It's also worth noticing that "patch" has no problem with either of the two
> files, but "git apply" does. At least on my system.
Yeah, patch does work for me. I'm so used to using 'git apply' these
days that I didn't think of trying that.
So what am I applying? Does my patch work for you Ads, or do you want
to update yours to move the version numbers?
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company