=== Applying patches on top of PostgreSQL commit ID 58ff4a0a08679356e502dfcbbc50e9bec94b77b1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Aug  6 07:36:36 UTC 2026
On branch cf/4942
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v28-0001-Recheck-permissions-after-lock-acquisition-in-de.patch ===
Applying: Recheck permissions after lock acquisition in dependency recording
=== using 'git am' to apply patch ./v28-0002-Only-track-successful-ACL-checks-in-aclcheck_tra.patch ===
Applying: Only track successful ACL checks in aclcheck_track_record()
error: sha1 information is lacking or useless (src/backend/catalog/aclchk.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Only track successful ACL checks in aclcheck_track_record()
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 ./v28-0002-Only-track-successful-ACL-checks-in-aclcheck_tra.patch ===
patching file src/backend/catalog/aclchk.c
Hunk #1 succeeded at 3936 (offset 40 lines).
Hunk #2 succeeded at 4141 (offset 40 lines).
patching file src/backend/commands/tablecmds.c
Hunk #2 succeeded at 14201 (offset 271 lines).
patching file src/test/modules/injection_points/Makefile
Hunk #1 FAILED at 19.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/injection_points/Makefile.rej
patching file src/test/modules/injection_points/expected/fk_column_ref.out
patching file src/test/modules/injection_points/meson.build
Hunk #1 succeeded at 53 with fuzz 2 (offset 2 lines).
patching file src/test/modules/injection_points/specs/fk_column_ref.spec
Unstaged changes after reset:
M	src/backend/catalog/aclchk.c
M	src/backend/commands/tablecmds.c
M	src/test/modules/injection_points/meson.build
Removing src/test/modules/injection_points/Makefile.rej
Removing src/test/modules/injection_points/expected/fk_column_ref.out
Removing src/test/modules/injection_points/specs/fk_column_ref.spec
=== using 'git apply' to apply patch ./v28-0002-Only-track-successful-ACL-checks-in-aclcheck_tra.patch ===
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/test/modules/injection_points/Makefile' with conflicts.
Falling back to direct application...
Applied patch to 'src/test/modules/injection_points/meson.build' cleanly.
Falling back to direct application...
U src/test/modules/injection_points/Makefile
diff --cc src/test/modules/injection_points/Makefile
index 25a3ddd890d,2af9d045555..00000000000
--- a/src/test/modules/injection_points/Makefile
+++ b/src/test/modules/injection_points/Makefile
@@@ -20,8 -19,8 +20,13 @@@ ISOLATION = basic 
  	    repack_temporal_multirange \
  	    repack_toast \
  	    syscache-update-pruned \
++<<<<<<< ours
 +	    wait_cleanup \
 +	    heap_lock_update
++=======
+ 	    heap_lock_update \
+ 	    fk_column_ref
++>>>>>>> theirs
  
  # some isolation tests require wal_level=replica
  ISOLATION_OPTS = --temp-config $(top_srcdir)/src/test/modules/injection_points/extra.conf