On Thu, Mar 30, 2017 at 4:46 PM, Kyotaro HORIGUCHI <
horiguchi.kyot...@lab.ntt.co.jp> wrote:

> Hello,
> At Thu, 30 Mar 2017 15:59:14 +1100, Venkata B Nagothi <nag1...@gmail.com>
> wrote in <CAEyp7J-TxoLZGh2qioA9nJJepiXUvvsAWrk=B
> xwu0j05x_j...@mail.gmail.com>
> > Yes, downloaded from the email on Windows and copied across to Linux and
> > did "git apply".
> The same works for me. But --keep-cr gave me the same result with
> you.
> > $ git am --keep-cr ~/work/patches/0001-Fix-a-bug-
> of-physical-replication-slot_a6f22e8.patch
> > Applying: Fix a bug of physical replication slot.
> > .git/rebase-apply/patch:13: trailing whitespace.
> > /*

for me too -

[dba@buildhost postgresql]$ git am --keep-cr
Applying: Fix a bug of physical replication slot.
/data/PostgreSQL-GIT-Repo/postgresql/.git/rebase-apply/patch:13: trailing
/data/PostgreSQL-GIT-Repo/postgresql/.git/rebase-apply/patch:14: trailing
 * This variable corresponds to restart_lsn in pg_replication_slots for a
/data/PostgreSQL-GIT-Repo/postgresql/.git/rebase-apply/patch:15: trailing
 * physical slot. This has a valid value only when it differs from the
/data/PostgreSQL-GIT-Repo/postgresql/.git/rebase-apply/patch:16: trailing
 * flush pointer.
/data/PostgreSQL-GIT-Repo/postgresql/.git/rebase-apply/patch:17: trailing
error: patch failed: src/backend/replication/walsender.c:210
error: src/backend/replication/walsender.c: patch does not apply
Patch failed at 0001 Fix a bug of physical replication slot.
The copy of the patch that failed is found in:
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

> https://git-scm.com/docs/git-am
> | --[no-]keep-cr
> |
> | With --keep-cr, call git mailsplit (see git-mailsplit[1]) with
> | the same option, to prevent it from stripping CR at the end of
> | lines. am.keepcr configuration variable can be used to specify
> | the default behaviour. --no-keep-cr is useful to override
> | am.keepcr.
> I don't know why it preserves CRs only for the lines, but anyway,
> don't you have am.keepcr in you configuration?

May be, I do not think i have am.keepcr in my configuration. I am not 100%
sure of it.

I only did "git apply.." which produced white space errors.


Venkata B N
Database Consultant

Reply via email to