On Fri, Feb 02, 2018 at 09:54:45PM +0100, Dmitry Dolgov wrote:
> For some reason I can't apply it clean to the latest master:
>
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file doc/src/sgml/func.sgml
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file src/backend/utils/adt/formatting.c
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file src/test/regress/expected/horology.out
> Hunk #1 FAILED at 2769.
> Hunk #2 FAILED at 2789.
> Hunk #3 succeeded at 2810 with fuzz 2.
> Hunk #4 succeeded at 2981 with fuzz 2.
> Hunk #5 succeeded at 3011 with fuzz 2.
> Hunk #6 FAILED at 3029.
> 3 out of 6 hunks FAILED -- saving rejects to file
> src/test/regress/expected/horology.out.rej
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file src/test/regress/sql/horology.sql
It is strange. I still can apply both v9 [1] and v10 [2] via 'git
apply'. And Patch Tester [3] says that it is applied. But maybe
it is because of my git (git version 2.16.1).
You can try also 'patch -p1':
$ patch -p1 < 0001-to-timestamp-format-checking-v10.patch
1 - https://www.postgresql.org/message-id/20180112125848.GA32559@zakirov.localdomain
2 - https://www.postgresql.org/message-id/20180201102449.GA29082@zakirov.localdomain
3 - http://commitfest.cputube.org/
--
Arthur Zakirov
Postgres Professional: http://www.postgrespro.com
Russian Postgres Company
