On Mon, Jan 23, 2017 at 2:06 PM, Venkata B Nagothi <nag1...@gmail.com> wrote: > > On Sat, Jan 14, 2017 at 5:10 AM, Vladimir Rusinov <vrusi...@google.com> > wrote: >> >> Attached are two new version of the patch: one keeps aliases, one don't. > > > Both the patches (with and without aliases) are not getting applied to the > latest master. Below is the error - > > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/src/include/access/xlog_fn.h b/src/include/access/xlog_fn.h > |index a013d047a2..a46b2f995c 100644 > |--- a/src/include/access/xlog_fn.h > |+++ b/src/include/access/xlog_fn.h > -------------------------- > File to patch:
xlog_fn.h is not necessary anymore as all the declarations of functions defined in pg_proc.h are now generated automatically, so the conflict is simple enough to resolve. -- Michael -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
