public inbox for [email protected]
help / color / mirror / Atom feedFrom: Chris Mayo <[email protected]>
To: Dave Page <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [PATCH] Document that a patch should be submitted to the list as an attachment
Date: Tue, 11 Oct 2016 18:14:46 +0100
Message-ID: <[email protected]> (raw)
In-Reply-To: <CA+OCxozwteHaoa9ge5n2WXu9SgF71cn8Z118a5E2JEaNP0yBTw@mail.gmail.com>
References: <[email protected]>
<CA+OCxozwteHaoa9ge5n2WXu9SgF71cn8Z118a5E2JEaNP0yBTw@mail.gmail.com>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgadmin-hackers>
On 11/10/16 15:34, Dave Page wrote:
> Hi
>
> On Monday, October 10, 2016, Chris Mayo <[email protected] <mailto:[email protected]>> wrote:
>
> Signed-off-by: Chris Mayo <[email protected] <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 [email protected] <mailto:[email protected]>.
> /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
--
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
view thread (6+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected]
Subject: Re: [PATCH] Document that a patch should be submitted to the list as an attachment
In-Reply-To: <[email protected]>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox