=== Applying patches on top of PostgreSQL commit ID cdf1f5a607330eaf21a8fc669cb65cd9135472ba ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jul 19 16:48:20 UTC 2025
On branch cf/5702
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Add-function-pg_compression_available.patch ===
Applying: Add function pg_compression_available
=== using 'git am' to apply patch ./0002-Split-TOAST-compression-tests-into-two-files.patch ===
Applying: Split TOAST compression tests into two files
Using index info to reconstruct a base tree...
M	src/test/regress/expected/compression.out
A	src/test/regress/expected/compression_1.out
M	src/test/regress/parallel_schedule
M	src/test/regress/sql/compression.sql
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in src/test/regress/sql/compression_lz4.sql
Auto-merging src/test/regress/sql/compression_lz4.sql
CONFLICT (add/add): Merge conflict in src/test/regress/expected/compression_lz4_1.out
Auto-merging src/test/regress/expected/compression_lz4_1.out
CONFLICT (add/add): Merge conflict in src/test/regress/expected/compression_lz4.out
Auto-merging src/test/regress/expected/compression_lz4.out
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Split TOAST compression tests into two files
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/regress/expected/compression_lz4.out
M	src/test/regress/expected/compression_lz4_1.out
M	src/test/regress/sql/compression_lz4.sql
=== using patch(1) to apply patch ./0002-Split-TOAST-compression-tests-into-two-files.patch ===
patching file src/test/regress/expected/compression.out
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 6.
Hunk #3 FAILED at 28.
Hunk #4 FAILED at 41.
Hunk #5 FAILED at 61.
Hunk #6 FAILED at 111.
Hunk #7 FAILED at 136.
Hunk #8 FAILED at 160.
Hunk #9 FAILED at 179.
Hunk #10 FAILED at 344.
10 out of 10 hunks FAILED -- saving rejects to file src/test/regress/expected/compression.out.rej
The next patch would delete the file src/test/regress/expected/compression_1.out,
which does not exist!  Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/test/regress/expected/compression_lz4.out,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/test/regress/expected/compression_lz4_1.out,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
patching file src/test/regress/parallel_schedule
Hunk #1 FAILED at 123.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/parallel_schedule.rej
patching file src/test/regress/sql/compression.sql
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 8.
Hunk #3 FAILED at 76.
3 out of 3 hunks FAILED -- saving rejects to file src/test/regress/sql/compression.sql.rej
patching file src/test/regress/sql/compression_lz4.sql (copied from src/test/regress/sql/compression.sql)
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 94.
Hunk #3 FAILED at 128.
3 out of 3 hunks FAILED -- saving rejects to file src/test/regress/sql/compression_lz4.sql.rej
Unstaged changes after reset:
M	src/test/regress/sql/compression_lz4.sql
Removing src/test/regress/expected/compression.out.rej
Removing src/test/regress/parallel_schedule.rej
Removing src/test/regress/sql/compression.sql.rej
Removing src/test/regress/sql/compression_lz4.sql.rej
=== using 'git apply' to apply patch ./0002-Split-TOAST-compression-tests-into-two-files.patch ===
Applied patch to 'src/test/regress/expected/compression.out' cleanly.
error: src/test/regress/expected/compression_1.out: does not exist in index
Performing three-way merge...
Applied patch to 'src/test/regress/expected/compression_lz4.out' with conflicts.
Performing three-way merge...
Applied patch to 'src/test/regress/expected/compression_lz4_1.out' with conflicts.
Applied patch to 'src/test/regress/parallel_schedule' cleanly.
Applied patch to 'src/test/regress/sql/compression.sql' cleanly.
Performing three-way merge...
Applied patch to 'src/test/regress/sql/compression_lz4.sql' with conflicts.