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

From: Chris Mayo <aklhfex(at)gmail(dot)com>
To: Dave Page <dpage(at)pgadmin(dot)org>
Cc: "pgadmin-hackers(at)postgresql(dot)org" <pgadmin-hackers(at)postgresql(dot)org>
Subject: Re: [PATCH] Document that a patch should be submitted to the list as an attachment
Date: 2016-10-11 17:14:46
Message-ID: de99cdf0-026b-c62c-cecb-fcd6e6ffec15@gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgadmin-hackers

On 11/10/16 15:34, Dave Page wrote:
> Hi
>
> On Monday, October 10, 2016, Chris Mayo <aklhfex(at)gmail(dot)com <mailto:aklhfex(at)gmail(dot)com>> wrote:
>
> Signed-off-by: Chris Mayo <aklhfex(at)gmail(dot)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(at)postgresql(dot)org <mailto:pgadmin-hackers(at)postgresql(dot)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.

Chris

In response to

Responses

Browse pgadmin-hackers by date

  From Date Subject
Next Message Teun Dani?ls 2016-10-11 20:26:09 pgadmin4 saving query
Previous Message Dave Page 2016-10-11 15:40:30 RM1849: Auto-generating security keys