=== Applying patches on top of PostgreSQL commit ID d5ea206728de7cb301d2f572055a76d4ea43bc8d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Mar  6 07:09:22 UTC 2026
On branch cf/6234
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Introduce-a-new-GUC-wal_sender_shutdown_timeout.patch ===
Applying: Introduce a new GUC 'wal_sender_shutdown_timeout'.
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/test/subscription/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/subscription/meson.build
CONFLICT (content): Merge conflict in src/test/subscription/meson.build
Auto-merging doc/src/sgml/config.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 Introduce a new GUC 'wal_sender_shutdown_timeout'.
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".
Unstaged changes after reset:
M	doc/src/sgml/config.sgml
M	doc/src/sgml/high-availability.sgml
M	src/backend/replication/walsender.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/replication/walsender.h
M	src/test/subscription/meson.build
Removing src/test/subscription/t/037_walsnd_immediate_shutdown.pl
=== using patch(1) to apply patch ./v2-0001-Introduce-a-new-GUC-wal_sender_shutdown_timeout.patch ===
patching file doc/src/sgml/config.sgml
Hunk #1 succeeded at 4806 (offset 16 lines).
patching file doc/src/sgml/high-availability.sgml
patching file src/backend/replication/walsender.c
patching file src/backend/utils/misc/guc_parameters.dat
patching file src/backend/utils/misc/postgresql.conf.sample
patching file src/include/replication/walsender.h
patching file src/test/subscription/meson.build
Hunk #1 FAILED at 46.
1 out of 1 hunk FAILED -- saving rejects to file src/test/subscription/meson.build.rej
patching file src/test/subscription/t/037_walsnd_immediate_shutdown.pl
Unstaged changes after reset:
M	doc/src/sgml/config.sgml
M	doc/src/sgml/high-availability.sgml
M	src/backend/replication/walsender.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/replication/walsender.h
Removing src/test/subscription/meson.build.rej
Removing src/test/subscription/t/037_walsnd_immediate_shutdown.pl
=== using 'git apply' to apply patch ./v2-0001-Introduce-a-new-GUC-wal_sender_shutdown_timeout.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/high-availability.sgml' cleanly.
Applied patch to 'src/backend/replication/walsender.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/replication/walsender.h' cleanly.
Applied patch to 'src/test/subscription/meson.build' with conflicts.
Falling back to direct application...
U src/test/subscription/meson.build
diff --cc src/test/subscription/meson.build
index f4a9cf5057f,3b9d27fba0b..00000000000
--- a/src/test/subscription/meson.build
+++ b/src/test/subscription/meson.build
@@@ -46,7 -46,7 +46,11 @@@ tests += 
        't/034_temporal.pl',
        't/035_conflicts.pl',
        't/036_sequences.pl',
++<<<<<<< ours
 +      't/037_except.pl',
++=======
+       't/037_walsnd_immediate_shutdown.pl',
++>>>>>>> theirs
        't/100_bugs.pl',
      ],
    },