=== Applying patches on top of PostgreSQL commit ID d6bf0ab1704c62f94875d25dd71c4baa1feac5be === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 12 08:48:27 UTC 2026 On branch cf/4337 nothing to commit, working tree clean === using 'git am' to apply patch ./v40-0001-Allow-to-prolong-life-span-of-transition-tables-.patch === Applying: Allow to prolong life span of transition tables until transaction end === using 'git am' to apply patch ./v40-0002-Add-relation-option-incremental_view_maintenance.patch === Applying: Add relation option incremental_view_maintenance === using 'git am' to apply patch ./v40-0003-Add-Incremental-View-Maintenance-support.patch === Applying: Add Incremental View Maintenance support === using 'git am' to apply patch ./v40-0004-Add-regression-tests-for-Incremental-View-Mainte.patch === Applying: Add regression tests for Incremental View Maintenance 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 regression tests for Incremental View Maintenance 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 ./v40-0004-Add-regression-tests-for-Incremental-View-Mainte.patch === patching file src/test/isolation/expected/ivm-create-insert.out patching file src/test/isolation/expected/ivm-create-insert2.out patching file src/test/isolation/expected/ivm-create-insert3.out patching file src/test/isolation/expected/ivm-insert-insert.out patching file src/test/isolation/expected/ivm-insert-insert2.out patching file src/test/isolation/expected/ivm-insert-insert3.out patching file src/test/isolation/expected/ivm-refresh-insert.out patching file src/test/isolation/expected/ivm-refresh-insert2.out patching file src/test/isolation/expected/ivm-refresh-insert3.out patching file src/test/isolation/isolation_schedule Hunk #1 FAILED at 129. 1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej patching file src/test/isolation/specs/ivm-create-insert.spec patching file src/test/isolation/specs/ivm-create-insert2.spec patching file src/test/isolation/specs/ivm-create-insert3.spec patching file src/test/isolation/specs/ivm-insert-insert.spec patching file src/test/isolation/specs/ivm-insert-insert2.spec patching file src/test/isolation/specs/ivm-insert-insert3.spec patching file src/test/isolation/specs/ivm-refresh-insert.spec patching file src/test/isolation/specs/ivm-refresh-insert2.spec patching file src/test/isolation/specs/ivm-refresh-insert3.spec patching file src/test/regress/expected/incremental_matview.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/incremental_matview.sql Unstaged changes after reset: M src/test/regress/parallel_schedule Removing src/test/isolation/expected/ivm-create-insert.out Removing src/test/isolation/expected/ivm-create-insert2.out Removing src/test/isolation/expected/ivm-create-insert3.out Removing src/test/isolation/expected/ivm-insert-insert.out Removing src/test/isolation/expected/ivm-insert-insert2.out Removing src/test/isolation/expected/ivm-insert-insert3.out Removing src/test/isolation/expected/ivm-refresh-insert.out Removing src/test/isolation/expected/ivm-refresh-insert2.out Removing src/test/isolation/expected/ivm-refresh-insert3.out Removing src/test/isolation/isolation_schedule.rej Removing src/test/isolation/specs/ivm-create-insert.spec Removing src/test/isolation/specs/ivm-create-insert2.spec Removing src/test/isolation/specs/ivm-create-insert3.spec Removing src/test/isolation/specs/ivm-insert-insert.spec Removing src/test/isolation/specs/ivm-insert-insert2.spec Removing src/test/isolation/specs/ivm-insert-insert3.spec Removing src/test/isolation/specs/ivm-refresh-insert.spec Removing src/test/isolation/specs/ivm-refresh-insert2.spec Removing src/test/isolation/specs/ivm-refresh-insert3.spec Removing src/test/regress/expected/incremental_matview.out Removing src/test/regress/sql/incremental_matview.sql === using 'git apply' to apply patch ./v40-0004-Add-regression-tests-for-Incremental-View-Mainte.patch === Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... 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... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/parallel_schedule' cleanly. Falling back to direct application... U src/test/isolation/isolation_schedule diff --cc src/test/isolation/isolation_schedule index a27480a86a2,b475bd57cce..00000000000 --- a/src/test/isolation/isolation_schedule +++ b/src/test/isolation/isolation_schedule @@@ -130,4 -129,12 +130,16 @@@ test: lock-nowai test: for-portion-of test: ddl-dependency-locking test: pub-concurrent-drop ++<<<<<<< ours +test: drop-owned-grant ++======= + test: ivm-create-insert + test: ivm-create-insert2 + test: ivm-create-insert3 + test: ivm-insert-insert + test: ivm-insert-insert2 + test: ivm-insert-insert3 + test: ivm-refresh-insert + test: ivm-refresh-insert2 + test: ivm-refresh-insert3 ++>>>>>>> theirs