On Thu, Mar 30, 2017 at 3:51 PM, Kyotaro HORIGUCHI < horiguchi.kyot...@lab.ntt.co.jp> wrote:
> At Thu, 30 Mar 2017 11:12:56 +1100, Venkata B Nagothi <nag1...@gmail.com> > wrote in <CAEyp7J9ZuuGc_Ndgw-rQF5oWUPH+p4=p7XE-B5cC3QRr6SUT7w@mail. > gmail.com> > > On Thu, Mar 30, 2017 at 10:55 AM, Michael Paquier < > michael.paqu...@gmail.com > > > wrote: > > > > > 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. > > > > /* > > > 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 > ... > > > 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. > > > > > > > patch -p1 seems to be working. Thanks ! > > That's quite strange. The patch I sent doesn't cantain trailing > spaces at all. The cited lines doesn't seem to contain them. It > applied cleanly with "git am" for me. > > The file restored from the attachment of received mail also don't. > > The original files contains the following, > > 0002440 66 6f 72 20 61 0a 2b 20 2a 20 70 68 79 73 69 63 > f o r a \n + * p h y s i c > > The corresponding part of the file restored from mail on Windows > is the following, > 0002460 63 61 74 69 6f 6e 5f 73 6c 6f 74 73 20 66 6f 72 > c a t i o n _ s l o t s f o r > 0002500 20 61 0d 0a 2b 20 2a 20 70 68 79 73 69 63 61 6c > a \r \n + * p h y s i c a l > > Both doesn't contain a space at the end of a line. How did you > retrieve the patch from the mail? > Yes, downloaded from the email on Windows and copied across to Linux and did "git apply". Regards, Venkata B N Database Consultant
