=== Applying patches on top of PostgreSQL commit ID da82fbb8f9a3b1e46b55d5975ef59113cd3a59a6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 17 18:01:31 UTC 2026
On branch cf/6903
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Add-regression-test-for-SETOF-composite-invalidation.patch ===
Applying: Add regression test for SETOF composite invalidation
=== using 'git am' to apply patch ./0002-Track-RTE_FUNCTION-composite-rowtype-dependencies.patch ===
Applying: Track RTE_FUNCTION composite rowtype dependencies
=== using 'git am' to apply patch ./0003-Add-TAP-test-for-plpgsql-RETURN-QUERY-DDL-race.patch ===
Applying: Add TAP test for plpgsql RETURN QUERY DDL race
Using index info to reconstruct a base tree...
M	src/test/modules/test_misc/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_misc/meson.build
CONFLICT (content): Merge conflict in src/test/modules/test_misc/meson.build
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 TAP test for plpgsql RETURN QUERY DDL race
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 ./0003-Add-TAP-test-for-plpgsql-RETURN-QUERY-DDL-race.patch ===
patching file src/pl/plpgsql/src/pl_exec.c
patching file src/test/modules/test_misc/meson.build
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/test_misc/meson.build.rej
patching file src/test/modules/test_misc/t/012_plpgsql_composite_replan_race.pl
Unstaged changes after reset:
M	src/pl/plpgsql/src/pl_exec.c
Removing src/test/modules/test_misc/meson.build.rej
Removing src/test/modules/test_misc/t/012_plpgsql_composite_replan_race.pl
=== using 'git apply' to apply patch ./0003-Add-TAP-test-for-plpgsql-RETURN-QUERY-DDL-race.patch ===
Applied patch to 'src/pl/plpgsql/src/pl_exec.c' cleanly.
Applied patch to 'src/test/modules/test_misc/meson.build' with conflicts.
Falling back to direct application...
U src/test/modules/test_misc/meson.build
diff --cc src/test/modules/test_misc/meson.build
index 969e90b396d,a4f4f57134b..00000000000
--- a/src/test/modules/test_misc/meson.build
+++ b/src/test/modules/test_misc/meson.build
@@@ -20,8 -20,7 +20,12 @@@ tests += 
        't/009_log_temp_files.pl',
        't/010_index_concurrently_upsert.pl',
        't/011_lock_stats.pl',
++<<<<<<< ours
 +      't/012_ddlutils.pl',
 +      't/013_temp_obj_multisession.pl',
++=======
+       't/012_plpgsql_composite_replan_race.pl',
++>>>>>>> theirs
      ],
      # The injection points are cluster-wide, so disable installcheck
      'runningcheck': false,