=== Applying patches on top of PostgreSQL commit ID 228a1f9542792c6533ef74c2e7aefad0da1d9a7a ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Apr 19 07:52:22 UTC 2026
On branch cf/4942
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch ===
Applying: Avoid orphaned objects dependencies
Using index info to reconstruct a base tree...
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/pg_aggregate.c
M	src/backend/catalog/pg_attrdef.c
M	src/backend/catalog/pg_cast.c
M	src/backend/catalog/pg_collation.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/catalog/pg_conversion.c
M	src/backend/catalog/pg_depend.c
M	src/backend/catalog/pg_operator.c
M	src/backend/catalog/pg_proc.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_range.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/alter.c
M	src/backend/commands/amcmds.c
A	src/backend/commands/cluster.c
M	src/backend/commands/event_trigger.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/operatorcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/proclang.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/typecmds.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/utils/errcodes.txt
M	src/include/catalog/dependency.h
M	src/include/catalog/objectaddress.h
M	src/test/isolation/isolation_schedule
M	src/test/regress/expected/alter_table.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/alter_table.out
Auto-merging src/test/isolation/isolation_schedule
CONFLICT (content): Merge conflict in src/test/isolation/isolation_schedule
Auto-merging src/include/catalog/objectaddress.h
Auto-merging src/include/catalog/dependency.h
Auto-merging src/backend/utils/errcodes.txt
Auto-merging src/backend/rewrite/rewriteDefine.c
Auto-merging src/backend/commands/typecmds.c
Auto-merging src/backend/commands/tsearchcmds.c
Auto-merging src/backend/commands/trigger.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/statscmds.c
Auto-merging src/backend/commands/sequence.c
Auto-merging src/backend/commands/proclang.c
Auto-merging src/backend/commands/policy.c
Auto-merging src/backend/commands/operatorcmds.c
Auto-merging src/backend/commands/opclasscmds.c
Auto-merging src/backend/commands/indexcmds.c
Auto-merging src/backend/commands/functioncmds.c
Auto-merging src/backend/commands/foreigncmds.c
Auto-merging src/backend/commands/extension.c
Auto-merging src/backend/commands/event_trigger.c
CONFLICT (modify/delete): src/backend/commands/cluster.c deleted in HEAD and modified in Avoid orphaned objects dependencies. Version Avoid orphaned objects dependencies of src/backend/commands/cluster.c left in tree.
Auto-merging src/backend/commands/amcmds.c
Auto-merging src/backend/commands/alter.c
Auto-merging src/backend/catalog/toasting.c
Auto-merging src/backend/catalog/pg_type.c
Auto-merging src/backend/catalog/pg_range.c
Auto-merging src/backend/catalog/pg_publication.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_publication.c
Auto-merging src/backend/catalog/pg_proc.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_proc.c
Auto-merging src/backend/catalog/pg_operator.c
Auto-merging src/backend/catalog/pg_depend.c
Auto-merging src/backend/catalog/pg_conversion.c
Auto-merging src/backend/catalog/pg_constraint.c
Auto-merging src/backend/catalog/pg_collation.c
Auto-merging src/backend/catalog/pg_cast.c
Auto-merging src/backend/catalog/pg_attrdef.c
Auto-merging src/backend/catalog/pg_aggregate.c
Auto-merging src/backend/catalog/objectaddress.c
Auto-merging src/backend/catalog/index.c
Auto-merging src/backend/catalog/heap.c
Auto-merging src/backend/catalog/dependency.c
CONFLICT (content): Merge conflict in src/backend/catalog/dependency.c
Auto-merging src/backend/catalog/aclchk.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Avoid orphaned objects dependencies
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 ./v19-0001-Avoid-orphaned-objects-dependencies.patch ===
patching file src/backend/catalog/aclchk.c
Hunk #1 succeeded at 1374 (offset 33 lines).
patching file src/backend/catalog/dependency.c
Hunk #1 succeeded at 1590 (offset 71 lines).
Hunk #2 succeeded at 1896 (offset 103 lines).
Hunk #3 succeeded at 1923 (offset 103 lines).
Hunk #4 succeeded at 1935 (offset 103 lines).
Hunk #5 succeeded at 1956 (offset 103 lines).
Hunk #6 succeeded at 2065 (offset 114 lines).
Hunk #7 succeeded at 2090 (offset 114 lines).
Hunk #8 succeeded at 2099 (offset 114 lines).
Hunk #9 succeeded at 2108 (offset 114 lines).
Hunk #10 succeeded at 2117 (offset 114 lines).
Hunk #11 succeeded at 2126 (offset 114 lines).
Hunk #12 succeeded at 2135 (offset 114 lines).
Hunk #13 succeeded at 2152 (offset 114 lines).
Hunk #14 succeeded at 2180 (offset 114 lines).
Hunk #15 succeeded at 2209 (offset 114 lines).
Hunk #16 succeeded at 2286 (offset 114 lines).
Hunk #17 succeeded at 2294 (offset 114 lines).
Hunk #18 succeeded at 2302 (offset 114 lines).
Hunk #19 succeeded at 2313 (offset 114 lines).
Hunk #20 succeeded at 2329 (offset 114 lines).
Hunk #21 succeeded at 2337 (offset 114 lines).
Hunk #22 succeeded at 2346 (offset 114 lines).
Hunk #23 succeeded at 2373 (offset 114 lines).
Hunk #24 succeeded at 2398 (offset 114 lines).
Hunk #25 FAILED at 2333.
Hunk #26 succeeded at 2515 (offset 115 lines).
Hunk #27 succeeded at 2539 (offset 115 lines).
Hunk #28 succeeded at 2574 (offset 115 lines).
Hunk #29 succeeded at 2605 (offset 115 lines).
Hunk #30 succeeded at 2681 (offset 115 lines).
1 out of 30 hunks FAILED -- saving rejects to file src/backend/catalog/dependency.c.rej
patching file src/backend/catalog/heap.c
Hunk #1 succeeded at 858 (offset 21 lines).
Hunk #2 succeeded at 867 (offset 21 lines).
Hunk #3 succeeded at 1478 (offset 24 lines).
Hunk #4 succeeded at 1500 (offset 24 lines).
Hunk #5 succeeded at 3969 (offset 165 lines).
Hunk #6 succeeded at 3977 (offset 165 lines).
patching file src/backend/catalog/index.c
Hunk #1 succeeded at 1123 (offset 6 lines).
Hunk #2 succeeded at 1136 (offset 6 lines).
Hunk #3 succeeded at 1157 (offset 6 lines).
Hunk #4 succeeded at 1174 (offset 6 lines).
Hunk #5 succeeded at 1196 (offset 6 lines).
Hunk #6 succeeded at 1205 (offset 6 lines).
Hunk #7 succeeded at 2029 (offset 19 lines).
Hunk #8 succeeded at 2048 (offset 19 lines).
patching file src/backend/catalog/objectaddress.c
Hunk #1 succeeded at 2696 (offset 101 lines).
patching file src/backend/catalog/pg_aggregate.c
Hunk #1 succeeded at 749 (offset 1 line).
Hunk #2 succeeded at 764 (offset 1 line).
Hunk #3 succeeded at 772 (offset 1 line).
Hunk #4 succeeded at 780 (offset 1 line).
Hunk #5 succeeded at 788 (offset 1 line).
Hunk #6 succeeded at 796 (offset 1 line).
Hunk #7 succeeded at 804 (offset 1 line).
Hunk #8 succeeded at 812 (offset 1 line).
patching file src/backend/catalog/pg_attrdef.c
Hunk #1 succeeded at 119 (offset -59 lines).
patching file src/backend/catalog/pg_cast.c
patching file src/backend/catalog/pg_collation.c
patching file src/backend/catalog/pg_constraint.c
Hunk #1 succeeded at 266 (offset 2 lines).
Hunk #2 succeeded at 298 (offset 2 lines).
Hunk #3 succeeded at 318 (offset 2 lines).
Hunk #4 succeeded at 353 (offset 2 lines).
Hunk #5 succeeded at 373 (offset 2 lines).
Hunk #6 succeeded at 1185 (offset 43 lines).
patching file src/backend/catalog/pg_conversion.c
patching file src/backend/catalog/pg_depend.c
Hunk #1 FAILED at 20.
Hunk #2 succeeded at 101 (offset 2 lines).
Hunk #3 succeeded at 271 (offset 2 lines).
Hunk #4 succeeded at 739 (offset 2 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/backend/catalog/pg_depend.c.rej
patching file src/backend/catalog/pg_operator.c
patching file src/backend/catalog/pg_proc.c
Hunk #1 succeeded at 623 (offset 30 lines).
Hunk #2 FAILED at 607.
Hunk #3 FAILED at 628.
Hunk #4 succeeded at 665 with fuzz 1 (offset 23 lines).
Hunk #5 succeeded at 728 (offset 46 lines).
2 out of 5 hunks FAILED -- saving rejects to file src/backend/catalog/pg_proc.c.rej
patching file src/backend/catalog/pg_publication.c
Hunk #1 succeeded at 1150 with fuzz 2 (offset 709 lines).
Hunk #2 FAILED at 504.
Hunk #3 FAILED at 521.
Hunk #4 FAILED at 718.
3 out of 4 hunks FAILED -- saving rejects to file src/backend/catalog/pg_publication.c.rej
patching file src/backend/catalog/pg_range.c
Hunk #1 succeeded at 77 (offset 7 lines).
Hunk #2 succeeded at 111 (offset 7 lines).
patching file src/backend/catalog/pg_type.c
Hunk #3 succeeded at 499 (offset -2 lines).
Hunk #4 succeeded at 541 (offset -2 lines).
patching file src/backend/catalog/toasting.c
Hunk #1 succeeded at 390 (offset 7 lines).
patching file src/backend/commands/alter.c
Hunk #1 succeeded at 510 (offset 11 lines).
Hunk #2 succeeded at 818 (offset 12 lines).
patching file src/backend/commands/amcmds.c
can't find file to patch at input line 1628
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
|index 99193f5c886..c1a7ecbfab8 100644
|--- a/src/backend/commands/cluster.c
|+++ b/src/backend/commands/cluster.c
--------------------------
No file to patch.  Skipping patch.
4 out of 4 hunks ignored
patching file src/backend/commands/event_trigger.c
Hunk #1 succeeded at 333 (offset 6 lines).
patching file src/backend/commands/extension.c
Hunk #1 succeeded at 2303 (offset 268 lines).
Hunk #2 succeeded at 2312 (offset 268 lines).
Hunk #3 succeeded at 3454 (offset 373 lines).
Hunk #4 succeeded at 3745 (offset 373 lines).
Hunk #5 succeeded at 3902 (offset 373 lines).
patching file src/backend/commands/foreigncmds.c
Hunk #1 succeeded at 696 (offset 54 lines).
Hunk #2 succeeded at 705 (offset 54 lines).
Hunk #3 succeeded at 911 (offset 98 lines).
Hunk #4 succeeded at 920 with fuzz 1 (offset 98 lines).
Hunk #5 succeeded at 1061 (offset 106 lines).
Hunk #6 succeeded at 1306 (offset 106 lines).
Hunk #7 succeeded at 1584 (offset 106 lines).
patching file src/backend/commands/functioncmds.c
Hunk #1 succeeded at 1467 (offset 6 lines).
Hunk #2 succeeded at 1481 (offset 6 lines).
Hunk #3 succeeded at 1998 (offset 6 lines).
patching file src/backend/commands/indexcmds.c
Hunk #1 succeeded at 4580 (offset 92 lines).
patching file src/backend/commands/opclasscmds.c
Hunk #2 succeeded at 748 (offset 20 lines).
Hunk #3 succeeded at 771 (offset 20 lines).
Hunk #4 succeeded at 1536 (offset 43 lines).
Hunk #5 succeeded at 1553 (offset 43 lines).
Hunk #6 succeeded at 1562 (offset 43 lines).
Hunk #7 succeeded at 1596 (offset 43 lines).
Hunk #8 succeeded at 1680 (offset 43 lines).
Hunk #9 succeeded at 1689 (offset 43 lines).
patching file src/backend/commands/operatorcmds.c
Hunk #2 succeeded at 690 (offset 33 lines).
Hunk #3 succeeded at 726 (offset 33 lines).
patching file src/backend/commands/policy.c
patching file src/backend/commands/proclang.c
Hunk #1 succeeded at 191 (offset 1 line).
Hunk #2 succeeded at 206 (offset 1 line).
patching file src/backend/commands/sequence.c
Hunk #1 succeeded at 1696 (offset 5 lines).
patching file src/backend/commands/statscmds.c
Hunk #1 succeeded at 90 (offset 2 lines).
Hunk #2 succeeded at 593 (offset 56 lines).
Hunk #3 succeeded at 616 (offset 56 lines).
Hunk #4 succeeded at 638 (offset 56 lines).
patching file src/backend/commands/tablecmds.c
Hunk #1 succeeded at 3613 (offset 86 lines).
Hunk #2 succeeded at 7672 (offset 237 lines).
Hunk #3 succeeded at 10929 (offset 435 lines).
Hunk #4 succeeded at 15228 (offset 1251 lines).
Hunk #5 succeeded at 16832 (offset 1275 lines).
Hunk #6 succeeded at 16852 (offset 1275 lines).
Hunk #7 succeeded at 18578 (offset 1278 lines).
Hunk #8 succeeded at 19351 (offset 1278 lines).
patching file src/backend/commands/trigger.c
Hunk #1 succeeded at 1025 (offset 5 lines).
Hunk #2 succeeded at 1032 (offset 5 lines).
Hunk #3 succeeded at 1057 (offset 5 lines).
Hunk #4 succeeded at 1071 (offset 5 lines).
Hunk #5 succeeded at 1084 (offset 5 lines).
Hunk #6 succeeded at 1093 (offset 5 lines).
Hunk #7 succeeded at 1109 (offset 5 lines).
Hunk #8 succeeded at 1119 (offset 5 lines).
Hunk #9 succeeded at 1132 (offset 5 lines).
Hunk #10 succeeded at 1284 (offset 5 lines).
patching file src/backend/commands/tsearchcmds.c
Hunk #7 succeeded at 1101 with fuzz 2.
patching file src/backend/commands/typecmds.c
Hunk #1 succeeded at 1847 with fuzz 2 (offset 27 lines).
Hunk #2 succeeded at 1919 with fuzz 2 (offset 33 lines).
Hunk #3 succeeded at 2737 (offset 37 lines).
Hunk #4 succeeded at 4360 (offset 56 lines).
Hunk #5 succeeded at 4658 (offset 56 lines).
Hunk #6 succeeded at 4707 (offset 56 lines).
patching file src/backend/rewrite/rewriteDefine.c
patching file src/backend/utils/errcodes.txt
patching file src/include/catalog/dependency.h
Hunk #2 succeeded at 185 (offset 11 lines).
patching file src/include/catalog/objectaddress.h
Hunk #1 succeeded at 54 (offset 1 line).
patching file src/test/isolation/expected/test_dependencies_locks.out
patching file src/test/isolation/isolation_schedule
Hunk #1 FAILED at 115.
1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej
patching file src/test/isolation/specs/test_dependencies_locks.spec
patching file src/test/regress/expected/alter_table.out
Hunk #1 succeeded at 2949 (offset 87 lines).
Unstaged changes after reset:
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/pg_aggregate.c
M	src/backend/catalog/pg_attrdef.c
M	src/backend/catalog/pg_cast.c
M	src/backend/catalog/pg_collation.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/catalog/pg_conversion.c
M	src/backend/catalog/pg_depend.c
M	src/backend/catalog/pg_operator.c
M	src/backend/catalog/pg_proc.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_range.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/alter.c
M	src/backend/commands/amcmds.c
M	src/backend/commands/event_trigger.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/operatorcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/proclang.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/typecmds.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/utils/errcodes.txt
M	src/include/catalog/dependency.h
M	src/include/catalog/objectaddress.h
M	src/test/regress/expected/alter_table.out
Removing src/backend/catalog/dependency.c.rej
Removing src/backend/catalog/pg_depend.c.rej
Removing src/backend/catalog/pg_proc.c.rej
Removing src/backend/catalog/pg_publication.c.rej
Removing src/test/isolation/expected/test_dependencies_locks.out
Removing src/test/isolation/isolation_schedule.rej
Removing src/test/isolation/specs/test_dependencies_locks.spec
=== using 'git apply' to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch ===
Applied patch to 'src/backend/catalog/aclchk.c' cleanly.
Applied patch to 'src/backend/catalog/dependency.c' with conflicts.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/index.c' cleanly.
Applied patch to 'src/backend/catalog/objectaddress.c' cleanly.
Applied patch to 'src/backend/catalog/pg_aggregate.c' cleanly.
Applied patch to 'src/backend/catalog/pg_attrdef.c' cleanly.
Applied patch to 'src/backend/catalog/pg_cast.c' cleanly.
Applied patch to 'src/backend/catalog/pg_collation.c' cleanly.
Applied patch to 'src/backend/catalog/pg_constraint.c' cleanly.
Applied patch to 'src/backend/catalog/pg_conversion.c' cleanly.
Applied patch to 'src/backend/catalog/pg_depend.c' cleanly.
Applied patch to 'src/backend/catalog/pg_operator.c' cleanly.
Applied patch to 'src/backend/catalog/pg_proc.c' with conflicts.
Applied patch to 'src/backend/catalog/pg_publication.c' with conflicts.
Applied patch to 'src/backend/catalog/pg_range.c' cleanly.
Applied patch to 'src/backend/catalog/pg_type.c' cleanly.
Applied patch to 'src/backend/catalog/toasting.c' cleanly.
Applied patch to 'src/backend/commands/alter.c' cleanly.
Applied patch to 'src/backend/commands/amcmds.c' cleanly.
error: src/backend/commands/cluster.c: does not exist in index
Applied patch to 'src/backend/commands/event_trigger.c' cleanly.
Applied patch to 'src/backend/commands/extension.c' cleanly.
Applied patch to 'src/backend/commands/foreigncmds.c' cleanly.
Applied patch to 'src/backend/commands/functioncmds.c' cleanly.
Applied patch to 'src/backend/commands/indexcmds.c' cleanly.
Applied patch to 'src/backend/commands/opclasscmds.c' cleanly.
Applied patch to 'src/backend/commands/operatorcmds.c' cleanly.
Applied patch to 'src/backend/commands/policy.c' cleanly.
Applied patch to 'src/backend/commands/proclang.c' cleanly.
Applied patch to 'src/backend/commands/sequence.c' cleanly.
Applied patch to 'src/backend/commands/statscmds.c' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/commands/trigger.c' cleanly.
Applied patch to 'src/backend/commands/tsearchcmds.c' cleanly.
Applied patch to 'src/backend/commands/typecmds.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteDefine.c' cleanly.
Applied patch to 'src/backend/utils/errcodes.txt' cleanly.
Applied patch to 'src/include/catalog/dependency.h' cleanly.
Applied patch to 'src/include/catalog/objectaddress.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/isolation/isolation_schedule' with conflicts.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/alter_table.out' cleanly.