=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jan 17 07:18:20 UTC 2026
On branch cf/5379
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v11-0001-Fix-accessing-other-sessions-temp-tables.patch ===
Applying: Fix accessing other sessions temp tables
=== using 'git am' to apply patch ./v11-0002-Test-cross-session-access-restrictions-on-tempor.patch ===
Applying: Test cross-session access restrictions on temporary tables
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 Test cross-session access restrictions on temporary tables
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	src/test/modules/test_misc/meson.build
Removing src/test/modules/test_misc/t/010_temp_obj_multisession.pl
=== using patch(1) to apply patch ./v11-0002-Test-cross-session-access-restrictions-on-tempor.patch ===
patching file src/test/modules/test_misc/meson.build
Hunk #1 FAILED at 18.
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/010_temp_obj_multisession.pl
Removing src/test/modules/test_misc/meson.build.rej
Removing src/test/modules/test_misc/t/010_temp_obj_multisession.pl
=== using 'git apply' to apply patch ./v11-0002-Test-cross-session-access-restrictions-on-tempor.patch ===
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 6e8db1621a7,e56e1132ba3..00000000000
--- a/src/test/modules/test_misc/meson.build
+++ b/src/test/modules/test_misc/meson.build
@@@ -18,9 -18,7 +18,13 @@@ tests += 
        't/007_catcache_inval.pl',
        't/008_replslot_single_user.pl',
        't/009_log_temp_files.pl',
++<<<<<<< ours
 +      't/010_index_concurrently_upsert.pl',
++=======
+       't/010_temp_obj_multisession.pl',
++>>>>>>> theirs
      ],
 +    # The injection points are cluster-wide, so disable installcheck
 +    'runningcheck': false,
    },
  }