On Thu, Mar 30, 2017 at 8:49 AM, Venkata B Nagothi <nag1...@gmail.com> wrote: > On Tue, Mar 28, 2017 at 5:51 PM, Kyotaro HORIGUCHI > <horiguchi.kyot...@lab.ntt.co.jp> wrote: > I tried applying this patch to latest master, it is not getting applied > > [dba@buildhost postgresql]$ git apply > /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch > /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch:28: > trailing whitespace. > /* > /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch:29: > trailing whitespace. > * This variable corresponds to restart_lsn in pg_replication_slots for a > /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch:30: > trailing whitespace. > * physical slot. This has a valid value only when it differs from the > current > /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch:31: > trailing whitespace. > * flush pointer. > /data/postgresql-patches/9.5-ReplicationSlots-Bug-Patch/0001-Fix-a-bug-of-physical-replication-slot_a6f22e8.patch:32: > trailing whitespace. > */ > error: patch failed: src/backend/replication/walsender.c:210 > error: src/backend/replication/walsender.c: patch does not apply
git apply and git am can be very picky sometimes, so you may want to fallback to patch -p1 if things don't work. In this case it does. -- Michael -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
