On Tue, Nov 14, 2023 at 04:25:24PM +0530, Amul Sul wrote: > Changes looks pretty much straight forward, but patch failed to apply on the > latest master head(b41b1a7f490) at me.
Thanks for taking a look. Would you mind sharing the error(s) you are seeing? The patch applies fine on cfbot and my machine, and check-world continues to pass.
Nevermind, I usually use git apply or git am, here are those errors:
PG/ - (master) $ git apply ~/Downloads/retire_compatibility_macro_v1.patch error: patch failed: src/backend/access/brin/brin.c:297 error: src/backend/access/brin/brin.c: patch does not apply error: patch failed: src/backend/access/gin/ginscan.c:251 error: src/backend/access/gin/ginscan.c: patch does not apply error: patch failed: src/backend/access/transam/xact.c:1933 error: src/backend/access/transam/xact.c: patch does not apply error: patch failed: src/backend/commands/analyze.c:583 error: src/backend/commands/analyze.c: patch does not apply error: patch failed: src/backend/executor/nodeRecursiveunion.c:317 error: src/backend/executor/nodeRecursiveunion.c: patch does not apply error: patch failed: src/backend/executor/nodeSetOp.c:631 error: src/backend/executor/nodeSetOp.c: patch does not apply error: patch failed: src/backend/executor/nodeWindowAgg.c:216 error: src/backend/executor/nodeWindowAgg.c: patch does not apply error: patch failed: src/backend/executor/spi.c:547 error: src/backend/executor/spi.c: patch does not apply error: patch failed: src/backend/postmaster/autovacuum.c:555 error: src/backend/postmaster/autovacuum.c: patch does not apply error: patch failed: src/backend/postmaster/bgwriter.c:182 error: src/backend/postmaster/bgwriter.c: patch does not apply error: patch failed: src/backend/postmaster/checkpointer.c:290 error: src/backend/postmaster/checkpointer.c: patch does not apply error: patch failed: src/backend/postmaster/walwriter.c:178 error: src/backend/postmaster/walwriter.c: patch does not apply error: patch failed: src/backend/replication/logical/worker.c:3647 error: src/backend/replication/logical/worker.c: patch does not apply error: patch failed: src/backend/statistics/extended_stats.c:2237 error: src/backend/statistics/extended_stats.c: patch does not apply error: patch failed: src/backend/tcop/postgres.c:4457 error: src/backend/tcop/postgres.c: patch does not apply error: patch failed: src/backend/utils/cache/evtcache.c:91 error: src/backend/utils/cache/evtcache.c: patch does not apply error: patch failed: src/backend/utils/error/elog.c:1833 error: src/backend/utils/error/elog.c: patch does not apply error: patch failed: src/include/utils/memutils.h:66 error: src/include/utils/memutils.h: patch does not apply PG/ - (master) $