=== Applying patches on top of PostgreSQL commit ID 9ea3b6f751abd7701f3f32d9df26d66410754c94 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Aug  6 22:04:22 UTC 2025
On branch cf/5853
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Convert-src-tools-testint128.c-into-a-test-module.patch ===
Applying: Convert src/tools/testint128.c into a test module.
Using index info to reconstruct a base tree...
M	src/include/common/int128.h
M	src/test/modules/Makefile
M	src/test/modules/meson.build
A	src/tools/testint128.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_int128/test_int128.c
CONFLICT (content): Merge conflict in src/test/modules/test_int128/test_int128.c
Auto-merging src/test/modules/meson.build
Auto-merging src/test/modules/Makefile
Auto-merging src/include/common/int128.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Convert src/tools/testint128.c into a test module.
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/modules/test_int128/test_int128.c
=== using patch(1) to apply patch ./v5-0001-Convert-src-tools-testint128.c-into-a-test-module.patch ===
patching file src/include/common/int128.h
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file src/include/common/int128.h.rej
patching file src/test/modules/Makefile
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/Makefile.rej
patching file src/test/modules/meson.build
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file src/test/modules/meson.build.rej
The next patch would create the file src/test/modules/test_int128/.gitignore,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/test/modules/test_int128/Makefile,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/test/modules/test_int128/meson.build,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/test/modules/test_int128/t/001_test_int128.pl,
which already exists!  Skipping patch.
1 out of 1 hunk ignored
patching file src/test/modules/test_int128/test_int128.c (already renamed from src/tools/testint128.c)
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 10.
Hunk #3 FAILED at 36.
Hunk #4 FAILED at 48.
Hunk #5 FAILED at 75.
Hunk #6 FAILED at 99.
Hunk #7 FAILED at 114.
Hunk #8 FAILED at 128.
Hunk #9 FAILED at 146.
Hunk #10 FAILED at 160.
10 out of 10 hunks FAILED -- saving rejects to file src/test/modules/test_int128/test_int128.c.rej
Removing src/include/common/int128.h.rej
Removing src/test/modules/Makefile.rej
Removing src/test/modules/meson.build.rej
Removing src/test/modules/test_int128/test_int128.c.rej
=== using 'git apply' to apply patch ./v5-0001-Convert-src-tools-testint128.c-into-a-test-module.patch ===
Applied patch to 'src/include/common/int128.h' cleanly.
Applied patch to 'src/test/modules/Makefile' cleanly.
Applied patch to 'src/test/modules/meson.build' cleanly.
Performing three-way merge...
Applied patch to 'src/test/modules/test_int128/.gitignore' cleanly.
Performing three-way merge...
Applied patch to 'src/test/modules/test_int128/Makefile' cleanly.
Performing three-way merge...
Applied patch to 'src/test/modules/test_int128/meson.build' cleanly.
Performing three-way merge...
Applied patch to 'src/test/modules/test_int128/t/001_test_int128.pl' cleanly.
error: src/tools/testint128.c: does not exist in index