=== Applying patches on top of PostgreSQL commit ID 5bd2e236e21b0e158dda43c184260b9395ede4f4 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Sep 28 06:59:27 UTC 2026
On branch cf/7275
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Add-require_wal_receiver-connection-parameter-to-.patch ===
Applying: Add require_wal_receiver connection parameter to libpq
Using index info to reconstruct a base tree...
M	src/interfaces/libpq/fe-connect.c
M	src/test/recovery/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
Auto-merging src/interfaces/libpq/fe-connect.c
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 require_wal_receiver connection parameter to libpq
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-require_wal_receiver-connection-parameter-to-.patch ===
patching file doc/src/sgml/libpq.sgml
patching file src/interfaces/libpq/fe-connect.c
Hunk #6 succeeded at 4456 (offset 1 line).
Hunk #7 succeeded at 4789 with fuzz 2 (offset 7 lines).
Hunk #8 succeeded at 4818 (offset 10 lines).
Hunk #9 succeeded at 5184 (offset 10 lines).
Hunk #10 succeeded at 5300 (offset 10 lines).
patching file src/interfaces/libpq/libpq-int.h
patching file src/test/perl/PostgreSQL/Test/Utils.pm
patching file src/test/recovery/meson.build
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej
patching file src/test/recovery/t/057_require_wal_receiver.pl
patching file src/test/regress/pg_regress.c
Unstaged changes after reset:
M	doc/src/sgml/libpq.sgml
M	src/interfaces/libpq/fe-connect.c
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/057_require_wal_receiver.pl
=== using 'git apply' to apply patch ./v1-0001-Add-require_wal_receiver-connection-parameter-to-.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-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 ebb12dd8766,e32643be545..00000000000
--- a/src/test/recovery/meson.build
+++ b/src/test/recovery/meson.build
@@@ -65,7 -65,7 +65,11 @@@ tests += 
        't/054_unlogged_sequence_promotion.pl',
        't/055_cascade_reconnect.pl',
        't/056_standby_snapshot_export.pl',
++<<<<<<< ours
 +      't/057_snapshot_commit_race.pl',
++=======
+       't/057_require_wal_receiver.pl',
++>>>>>>> theirs
      ],
    },
  }