-------- Original-Nachricht --------
> Datum: Mon, 3 Jan 2011 10:44:19 +0100
> Von: Magnus Hagander <mag...@hagander.net>
> An: Brar Piening <b...@gmx.de>
> CC: pgsql-hackers@postgresql.org
> Betreff: Re: [HACKERS] Visual Studio 2010/Windows SDK 7.1 support


> This patch does not apply at all to my repository. Every single hunk
> fails - I have a feeling it might have double line-ending encodings or
> something like that? 

double line-endings indeed!
Surprisingly only some of them (<CR><CR><LF> follow some <CR><LF>'s).

I was quite unsure about the best line endings for this patch so I probably 
messed it up by converting them forth and back. Still I'm not sure if there's 
something wrong with my git config - perhaps due to using git-external-diff (I 
wasn't able to find win32 binaries for filterdiff).

Sorry about that!

perl -e "open(INFILE, '<VS2010.patch');open(OUTFILE, 
'>VS2010_fixed.patch');binmode(INFILE);binmode(OUTFILE);$/=\"\015\015\012\";$\=\"\015\012\";while(<INFILE>){chomp;
 print OUTFILE;}close(INFILE);close(OUTFILE)"

fixes the problem.

> Yeah, it looks that way - it's missing the ordering of the contrib
> arrays. I'll run it once for that now, and then please rebase your
> patch on top of that - makes it easier to review it.
> 
> If you still see any changes on top of that, then there's something
> strange going on..

No that was probably all.

My patch - fixed as described above - should apply to your repository once 
you've run perltidy.

I'll rebase the patch as soon as I return from work unless you tell me 
otherwise.

Best Regards

Brar
-- 
GMX DSL Doppel-Flat ab 19,99 Euro/mtl.! Jetzt mit 
gratis Handy-Flat! http://portal.gmx.net/de/go/dsl

-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Reply via email to