Postgres Pro
Downloads
Home   >   mailing lists

Re: [PATCH] Document that a patch should be submitted to the list as an attachment - Mailing list pgadmin-hackers

From Dave Page
Subject Re: [PATCH] Document that a patch should be submitted to the list as an attachment
Date
Msg-id CA+OCxowpkLjJ9o8mdPVUhh=0v3gR_k=gPjr0UX1VtqepJ1kSMQ@mail.gmail.com
Whole thread Raw
In response to Re: [PATCH] Document that a patch should be submitted to the list as an attachment  (Chris Mayo <aklhfex@gmail.com>)
Responses Re: [PATCH] Document that a patch should be submitted to the list as an attachment
List pgadmin-hackers
Tree view
Hi

On Tuesday, October 11, 2016, Chris Mayo <aklhfex@gmail.com> wrote:
On 11/10/16 15:34, Dave Page wrote:
> Hi
>
> On Monday, October 10, 2016, Chris Mayo <aklhfex@gmail.com <mailto:aklhfex@gmail.com>> wrote:
>
>     Signed-off-by: Chris Mayo <aklhfex@gmail.com <javascript:;>>
>     ---
>      docs/en_US/submitting_patches.rst | 8 ++++----
>      1 file changed, 4 insertions(+), 4 deletions(-)
>
>
> This doesn't apply - can you rebase it please?
>
> Thanks.
>
> (pgadmin4)snake:pgadmin4 dpage$ git apply ~/Downloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch
> /Users/dpage/Downloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch:13: trailing whitespace.
> the chances of it being rejected. Once you're happy with your work, mail it
> /Users/dpage/Downloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch:14: trailing whitespace.
> as an attachment to the mailing list pgadmin-hackers@postgresql.org <mailto:pgadmin-hackers@postgresql.org>.
> /Users/dpage/Downloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch:15: trailing whitespace.
> Please ensure you include a full description of what the patch does,
> /Users/dpage/Downloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch:16: trailing whitespace.
> as well as the rationale for any important design decisions.
> error: patch failed: docs/en_US/submitting_patches.rst:30
> error: docs/en_US/submitting_patches.rst: patch does not apply
>

I checked and I can't see anything wrong. I also tried downloading the patch from the web archive and using git apply.

The "trailing whitespace" errors may suggest the problem - the added lines in the patch don't have any whitespace.
Have you been near a Windows machine? I used unix2dos on the patch and then got the same result as above.

No, I've only been on my Mac. Your suggestion made me think though - I opened the patch in my editor, and it claims the original had Windows line endings. I converted them to \n and it applied just fine.

What does 'git config core.autocrlf' output for you?

In any case, I applied the patch. Thanks!


--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

pgadmin-hackers by date:

Previous
From: Dave Page
Date:
Subject: pgAdmin 4 commit: Clarify that patches should be sent as attachments.
Next
From: Priyanka Shendge
Date:
Subject: FTS nodes (Configuration, Dictionaries, Parser, Templates) patch