On Wed, 2012-10-10 at 11:48 +0100, Dave Page wrote:
> On Wed, Oct 10, 2012 at 5:38 AM, Vladimir Kokovic
> <vladimir.kokovic@gmail.com> wrote:
> > Hi,
> >
> > Flushing every time version.
>
> Thanks, but it still won't apply. Using git apply (most definitely the
> correct option), I get:
>
> raptor:pgAdmin3 dpage$ git apply ~/Downloads/pgadmin3-2.patch
> fatal: unrecognized input
>
> Using patch:
>
> raptor:pgAdmin3 dpage$ patch -p1 < ~/Downloads/pgadmin3-flush.patch
> patching file pgadmin/include/utils/sysSettings.h
> patch unexpectedly ends in middle of line
> patching file pgadmin/utils/sysSettings.cpp
> patch unexpectedly ends in middle of line
>
> How are you generating it? A simple "git diff > patch.diff" should
> work just fine. Do you have any options in your git config file that
> might be causing the output to be mangled?
>
> Guillaume, can you apply the patch?
>
Nope, I have the exact same messages.
--
Guillaume
http://blog.guillaume.lelarge.info
http://www.dalibo.com