=== Applying patches on top of PostgreSQL commit ID b7057e43467ff2d7c04c3abcf5ec35fcc7db9611 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Dec 28 15:16:19 UTC 2025 On branch cf/6349 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-cleanup-Split-long-Makefile-lists-across-lines-an.patch === Applying: cleanup: Split long Makefile lists across lines and sort them Using index info to reconstruct a base tree... M contrib/pageinspect/Makefile M src/backend/optimizer/Makefile M src/backend/storage/Makefile M src/bin/scripts/Makefile M src/interfaces/ecpg/Makefile M src/pl/tcl/Makefile M src/test/Makefile M src/test/examples/Makefile Falling back to patching base and 3-way merge... Auto-merging src/pl/tcl/Makefile CONFLICT (content): Merge conflict in src/pl/tcl/Makefile Auto-merging contrib/pageinspect/Makefile CONFLICT (content): Merge conflict in contrib/pageinspect/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 cleanup: Split long Makefile lists across lines and sort them 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 contrib/pageinspect/Makefile M src/pl/tcl/Makefile === using patch(1) to apply patch ./v4-0001-cleanup-Split-long-Makefile-lists-across-lines-an.patch === patching file contrib/pageinspect/Makefile Hunk #1 FAILED at 23. 1 out of 1 hunk FAILED -- saving rejects to file contrib/pageinspect/Makefile.rej patching file src/backend/optimizer/Makefile Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/optimizer/Makefile.rej patching file src/backend/storage/Makefile Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/storage/Makefile.rej patching file src/bin/scripts/Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file src/bin/scripts/Makefile.rej patching file src/interfaces/ecpg/Makefile Hunk #1 FAILED at 2. 1 out of 1 hunk FAILED -- saving rejects to file src/interfaces/ecpg/Makefile.rej patching file src/pl/tcl/Makefile Hunk #1 FAILED at 30. 1 out of 1 hunk FAILED -- saving rejects to file src/pl/tcl/Makefile.rej patching file src/test/Makefile Hunk #1 FAILED at 12. 1 out of 1 hunk FAILED -- saving rejects to file src/test/Makefile.rej patching file src/test/examples/Makefile Hunk #1 FAILED at 14. 1 out of 1 hunk FAILED -- saving rejects to file src/test/examples/Makefile.rej Removing contrib/pageinspect/Makefile.rej Removing src/backend/optimizer/Makefile.rej Removing src/backend/storage/Makefile.rej Removing src/bin/scripts/Makefile.rej Removing src/interfaces/ecpg/Makefile.rej Removing src/pl/tcl/Makefile.rej Removing src/test/Makefile.rej Removing src/test/examples/Makefile.rej === using 'git apply' to apply patch ./v4-0001-cleanup-Split-long-Makefile-lists-across-lines-an.patch === Applied patch to 'contrib/pageinspect/Makefile' with conflicts. Applied patch to 'src/backend/optimizer/Makefile' cleanly. Applied patch to 'src/backend/storage/Makefile' cleanly. Applied patch to 'src/bin/scripts/Makefile' cleanly. Applied patch to 'src/interfaces/ecpg/Makefile' cleanly. Applied patch to 'src/pl/tcl/Makefile' with conflicts. Applied patch to 'src/test/Makefile' cleanly. Applied patch to 'src/test/examples/Makefile' cleanly. U contrib/pageinspect/Makefile U src/pl/tcl/Makefile diff --cc contrib/pageinspect/Makefile index eae989569d0,4620bf71445..00000000000 --- a/contrib/pageinspect/Makefile +++ b/contrib/pageinspect/Makefile @@@ -23,7 -23,7 +23,11 @@@ DATA = pageinspect--1.12--1.13.sql pageinspect--1.0--1.1.sql PGFILEDESC = "pageinspect - functions to inspect contents of database pages" ++<<<<<<< ours +# "page" is first because it creates the extension. ++======= + # page is first because it creates the extension ++>>>>>>> theirs REGRESS = \ page \ brin \ diff --cc src/pl/tcl/Makefile index 7dc7cf3497a,7e59348964d..00000000000 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@@ -30,8 -30,7 +30,12 @@@ DATA = pltcl.control pltcl--1.0.sql pltclu.control pltclu--1.0.sql REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl ++<<<<<<< ours +# "pltcl_setup" is first because the other tests depend on the objects it +# creates. ++======= + # pltcl_setup is first because the other tests depend on the objects it creates ++>>>>>>> theirs REGRESS = \ pltcl_setup \ pltcl_call \