=== Applying patches on top of PostgreSQL commit ID 72e6184cd5fe82620693a2aae9e34452d1984459 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 13 07:52:25 UTC 2026 On branch cf/6904 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Add-isolation-tests-for-ON-CONFLICT-no-op-SSI-false-.patch === Applying: Add isolation tests for ON CONFLICT no-op SSI false negatives Using index info to reconstruct a base tree... M src/test/isolation/isolation_schedule Falling back to patching base and 3-way merge... Auto-merging src/test/isolation/isolation_schedule CONFLICT (content): Merge conflict in src/test/isolation/isolation_schedule 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 isolation tests for ON CONFLICT no-op SSI false negatives 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 ./0001-Add-isolation-tests-for-ON-CONFLICT-no-op-SSI-false-.patch === patching file src/test/isolation/expected/serializable-onconflict-do-nothing.out patching file src/test/isolation/expected/serializable-onconflict-noop-update.out patching file src/test/isolation/isolation_schedule Hunk #1 FAILED at 127. 1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej patching file src/test/isolation/specs/serializable-onconflict-do-nothing.spec patching file src/test/isolation/specs/serializable-onconflict-noop-update.spec Removing src/test/isolation/expected/serializable-onconflict-do-nothing.out Removing src/test/isolation/expected/serializable-onconflict-noop-update.out Removing src/test/isolation/isolation_schedule.rej Removing src/test/isolation/specs/serializable-onconflict-do-nothing.spec Removing src/test/isolation/specs/serializable-onconflict-noop-update.spec === using 'git apply' to apply patch ./0001-Add-isolation-tests-for-ON-CONFLICT-no-op-SSI-false-.patch === Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' with conflicts. Falling back to direct application... Falling back to direct application... U src/test/isolation/isolation_schedule diff --cc src/test/isolation/isolation_schedule index a27480a86a2,313e8abba6f..00000000000 --- a/src/test/isolation/isolation_schedule +++ b/src/test/isolation/isolation_schedule @@@ -129,5 -127,6 +129,11 @@@ test: matview-write-ske test: lock-nowait test: for-portion-of test: ddl-dependency-locking ++<<<<<<< ours +test: pub-concurrent-drop +test: drop-owned-grant ++======= + + test: serializable-onconflict-noop-update + test: serializable-onconflict-do-nothing ++>>>>>>> theirs