MIME-Version: 1.0
In-Reply-To: <1476124842-31390-1-git-send-email-aklhfex@gmail.com>
References: <1476124842-31390-1-git-send-email-aklhfex@gmail.com>
From: Dave Page <dpage@pgadmin.org>
Date: Tue, 11 Oct 2016 15:34:54 +0100
Message-ID: 
 <CA+OCxozwteHaoa9ge5n2WXu9SgF71cn8Z118a5E2JEaNP0yBTw@mail.gmail.com>
Subject: Re: [PATCH] Document that a patch should be
 submitted to the list as an attachment
To: Chris Mayo <aklhfex@gmail.com>
Cc: "pgadmin-hackers@postgresql.org" <pgadmin-hackers@postgresql.org>
Content-Type: multipart/alternative; boundary=001a113f9706b4a0e8053e97c7fb
Precedence: bulk
Sender: pgadmin-hackers-owner@postgresql.org

--001a113f9706b4a0e8053e97c7fb
Content-Type: text/plain; charset=UTF-8

Hi

On Monday, October 10, 2016, Chris Mayo <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.
/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


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

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

--001a113f9706b4a0e8053e97c7fb
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi<br><br>On Monday, October 10, 2016, Chris Mayo &lt;<a href=3D"mailto:akl=
hfex@gmail.com">aklhfex@gmail.com</a>&gt; wrote:<br><blockquote class=3D"gm=
ail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-le=
ft:1ex">Signed-off-by: Chris Mayo &lt;<a href=3D"javascript:;" onclick=3D"_=
e(event, &#39;cvml&#39;, &#39;aklhfex@gmail.com&#39;)">aklhfex@gmail.com</a=
>&gt;<br>
---<br>
=C2=A0docs/en_US/submitting_patches.<wbr>rst | 8 ++++----<br>
=C2=A01 file changed, 4 insertions(+), 4 deletions(-)<br>
<br></blockquote><div><br></div><div>This doesn&#39;t apply - can you rebas=
e it please?=C2=A0</div><div><br></div><div>Thanks.</div><div><br></div><di=
v><div>(pgadmin4)snake:pgadmin4 dpage$ git apply ~/Downloads/0001-Document-=
that-a-patch-should-be-submitted-to-the-lis.patch=C2=A0</div><div>/Users/dp=
age/Downloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.pat=
ch:13: trailing whitespace.</div><div>the chances of it being rejected. Onc=
e you&#39;re happy with your work, mail it</div><div>/Users/dpage/Downloads=
/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch:14: traili=
ng whitespace.</div><div>as an attachment to the mailing list <a href=3D"ma=
ilto:pgadmin-hackers@postgresql.org">pgadmin-hackers@postgresql.org</a>.</d=
iv><div>/Users/dpage/Downloads/0001-Document-that-a-patch-should-be-submitt=
ed-to-the-lis.patch:15: trailing whitespace.</div><div>Please ensure you in=
clude a full description of what the patch does,</div><div>/Users/dpage/Dow=
nloads/0001-Document-that-a-patch-should-be-submitted-to-the-lis.patch:16: =
trailing whitespace.</div><div>as well as the rationale for any important d=
esign decisions.</div><div>error: patch failed: docs/en_US/submitting_patch=
es.rst:30</div><div>error: docs/en_US/submitting_patches.rst: patch does no=
t apply</div></div><div><br></div><br><br>-- <br>Dave Page<br>Blog: <a href=
=3D"http://pgsnake.blogspot.com" target=3D"_blank">http://pgsnake.blogspot.=
com</a><br>Twitter: @pgsnake<br><br>EnterpriseDB UK: <a href=3D"http://www.=
enterprisedb.com" target=3D"_blank">http://www.enterprisedb.com</a><br>The =
Enterprise PostgreSQL Company<br><br>

--001a113f9706b4a0e8053e97c7fb--