Re: sysSettings::Flush()

Hi,

I don't know what is problem !
Maybe some blank line missing,
Try to add empty line at the end of file.

My git diff command:

cd pgadmin3; git diff master vk-20120512-pgadmin3 | filterdiff
--format=context > /tmp/pgadmin3.patch; cd ../


Best regards
Vladimir Kokovic
Belgrade, Serbia, 10.October 2012


On 10/10/12, Dave Page <dpage@pgadmin.org> 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?
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>