Subject: Re: [PATCH] Document that a patch should be
 submitted to the list as an attachment
To: Dave Page <dpage@pgadmin.org>
References: <1476124842-31390-1-git-send-email-aklhfex@gmail.com>
 <CA+OCxozwteHaoa9ge5n2WXu9SgF71cn8Z118a5E2JEaNP0yBTw@mail.gmail.com>
Cc: "pgadmin-hackers@postgresql.org" <pgadmin-hackers@postgresql.org>
From: Chris Mayo <aklhfex@gmail.com>
Message-ID: <de99cdf0-026b-c62c-cecb-fcd6e6ffec15@gmail.com>
Date: Tue, 11 Oct 2016 18:14:46 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.4.0
MIME-Version: 1.0
In-Reply-To: 
 <CA+OCxozwteHaoa9ge5n2WXu9SgF71cn8Z118a5E2JEaNP0yBTw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
Sender: pgadmin-hackers-owner@postgresql.org

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.

Chris


-- 
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers