Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bu4Cg-0000jY-VU for pgadmin-hackers@arkaria.postgresql.org; Tue, 11 Oct 2016 21:03:15 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bu4Cg-000471-IH for pgadmin-hackers@arkaria.postgresql.org; Tue, 11 Oct 2016 21:03:14 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bu4Cg-00046v-6s for pgadmin-hackers@postgresql.org; Tue, 11 Oct 2016 21:03:14 +0000 Received: from mail-it0-x230.google.com ([2607:f8b0:4001:c0b::230]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bu4Cb-0001eT-E7 for pgadmin-hackers@postgresql.org; Tue, 11 Oct 2016 21:03:13 +0000 Received: by mail-it0-x230.google.com with SMTP id l13so119053473itl.1 for ; Tue, 11 Oct 2016 14:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pgadmin-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=iEhxPfTibkiFXr1+R9vxoKA760lUYgFXXNWadV7ybGA=; b=f2u0fjb0JCqGZZ2GRPTpWDcqxB2MHUolmtyg0WCA9nswpNFXPUiFj7VuIlQJ5iE1DY As+vkpqN9VTds+QhkDICGFQXYIY9bhuNf9MzIzXOHzBedUFdm5GEVH+3zeMHPoGok9Er SoIEUSucK1qrTytFH9cS6gtTpXsCGpmSFOgbQBs0XGheLKcMjeDInlJ6mYNY3GFPOB0l sQGdBHA8LNGxOpSWCU9cCwSu0+xcsMUZrvHYKRYF3i1w6Od/1HQ/fK2Bze9WnhT0DKR0 mLiJ72YQ/yIZIDpqiPWWj8DVfUNp76mtdaLg72LMoUt7PfDjWBNfdLt8U5hCe3ivBxRW Xt5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=iEhxPfTibkiFXr1+R9vxoKA760lUYgFXXNWadV7ybGA=; b=O7K2UqU5pO8HV0vvD4jvTWsQPZ2KsriFrLoBxQ9bUFW9rvTNS7Z96qRtVkBN+lwCeH DHKXVuMrvrwZgm6Y0tA5ud/x/KWqoAf3f69qupBKn44q35WZJ5WVLBpyCK27AVsaq/np XnkQtGQyrXxatnCqVq838pTuCqLUg6SPEAEHUfshppXYT7EePiQ/o7horSlnfya+ZnKn lp9EjHIH4xWeBLABBF4LfhlRhRRy7JiX28/mVUWDdRxH9bk88pFKjPP3eL1MkisIkcg8 bdKkK7mO6mIp/IoiP0O0On/qBIHHsCOCbzH34IImgj7t1sFtVuFb7MdG9HS6XTzDlxi0 U3GA== X-Gm-Message-State: AA6/9RlEES1N3+gr+TeQW5X0Jg15qlEOjJDROobbL57RHbf1rBXymrZC3XPaKr1eVbXf799JyVcVDIcwVs1DPg== X-Received: by 10.36.202.131 with SMTP id k125mr8743862itg.100.1476219787056; Tue, 11 Oct 2016 14:03:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.146.135 with HTTP; Tue, 11 Oct 2016 14:03:06 -0700 (PDT) In-Reply-To: References: <1476124842-31390-1-git-send-email-aklhfex@gmail.com> From: Dave Page Date: Tue, 11 Oct 2016 22:03:06 +0100 Message-ID: Subject: Re: [PATCH] Document that a patch should be submitted to the list as an attachment To: Chris Mayo Cc: "pgadmin-hackers@postgresql.org" Content-Type: multipart/alternative; boundary=94eb2c089e5c04aec3053e9d347f X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --94eb2c089e5c04aec3053e9d347f Content-Type: text/plain; charset=UTF-8 Hi On Tuesday, October 11, 2016, Chris Mayo wrote: > On 11/10/16 15:34, Dave Page wrote: > > Hi > > > > On Monday, October 10, 2016, Chris Mayo >> wrote: > > > > Signed-off-by: Chris Mayo > > > > --- > > 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 > > > > 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 --94eb2c089e5c04aec3053e9d347f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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@g= mail.com <mailto:aklhfex@gmail.com>> wrot= e:
>
>=C2=A0 =C2=A0 =C2=A0Signed-off-by: Chris Mayo <aklh= fex@gmail.com <javascript:;>>
>=C2=A0 =C2=A0 =C2=A0---
>=C2=A0 =C2=A0 =C2=A0 docs/en_US/submitting_patches.rst | 8 ++++---= -
>=C2=A0 =C2=A0 =C2=A0 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 pg= admin-hackers@postgresql.org <mailto:p= gadmin-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 ad= ded 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= 9;ve only been on my Mac. Your suggestion made me think though - I opened t= he 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!


--
Da= ve Page
Blog: = http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK= : http://www.ente= rprisedb.com
The Enterprise PostgreSQL Company

--94eb2c089e5c04aec3053e9d347f--