=== Applying patches on top of PostgreSQL commit ID b20c952ce70370b22ea7a206d7b674a322397d28 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Jun 8 07:15:26 UTC 2026 On branch cf/6630 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Add-libpq-connection-parameter-max_wal_replay_siz.patch === Applying: Add libpq connection parameter max_wal_replay_size Using index info to reconstruct a base tree... M doc/src/sgml/libpq.sgml M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/libpq-fe.h M src/interfaces/libpq/libpq-int.h M src/test/perl/PostgreSQL/Test/Utils.pm M src/test/recovery/meson.build M src/test/regress/pg_regress.c Falling back to patching base and 3-way merge... Auto-merging src/test/regress/pg_regress.c Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Auto-merging src/test/perl/PostgreSQL/Test/Utils.pm Auto-merging src/interfaces/libpq/libpq-int.h Auto-merging src/interfaces/libpq/libpq-fe.h Auto-merging src/interfaces/libpq/fe-connect.c Auto-merging doc/src/sgml/libpq.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add libpq connection parameter max_wal_replay_size When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v1-0001-Add-libpq-connection-parameter-max_wal_replay_siz.patch === patching file doc/src/sgml/libpq.sgml patching file src/interfaces/libpq/fe-connect.c Hunk #2 succeeded at 520 (offset 4 lines). Hunk #3 succeeded at 692 (offset 4 lines). Hunk #4 succeeded at 2126 (offset 4 lines). Hunk #5 succeeded at 2991 (offset 4 lines). Hunk #6 succeeded at 4471 (offset 4 lines). Hunk #7 succeeded at 4811 (offset 4 lines). Hunk #8 succeeded at 5229 (offset 4 lines). patching file src/interfaces/libpq/libpq-fe.h patching file src/interfaces/libpq/libpq-int.h Hunk #1 succeeded at 427 (offset 2 lines). patching file src/test/perl/PostgreSQL/Test/Utils.pm Hunk #1 succeeded at 148 (offset 6 lines). patching file src/test/recovery/meson.build Hunk #1 FAILED at 61. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/053_max_wal_replay_size.pl patching file src/test/regress/pg_regress.c Hunk #1 succeeded at 851 (offset 11 lines). Unstaged changes after reset: M doc/src/sgml/libpq.sgml M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/libpq-fe.h M src/interfaces/libpq/libpq-int.h M src/test/perl/PostgreSQL/Test/Utils.pm M src/test/regress/pg_regress.c Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/053_max_wal_replay_size.pl === using 'git apply' to apply patch ./v1-0001-Add-libpq-connection-parameter-max_wal_replay_siz.patch === Applied patch to 'doc/src/sgml/libpq.sgml' cleanly. Applied patch to 'src/interfaces/libpq/fe-connect.c' cleanly. Applied patch to 'src/interfaces/libpq/libpq-fe.h' cleanly. Applied patch to 'src/interfaces/libpq/libpq-int.h' cleanly. Applied patch to 'src/test/perl/PostgreSQL/Test/Utils.pm' cleanly. Applied patch to 'src/test/recovery/meson.build' with conflicts. Falling back to direct application... Applied patch to 'src/test/regress/pg_regress.c' cleanly. U src/test/recovery/meson.build diff --cc src/test/recovery/meson.build index 9eb8ed11425,e824ffadc12..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -61,7 -61,7 +61,11 @@@ tests += 't/050_redo_segment_missing.pl', 't/051_effective_wal_level.pl', 't/052_checkpoint_segment_missing.pl', ++<<<<<<< ours + 't/053_standby_login_event_trigger.pl', ++======= + 't/053_max_wal_replay_size.pl', ++>>>>>>> theirs ], }, }