=== Applying patches on top of PostgreSQL commit ID 428a87607b58949cfc35eeab94825e2de0d541a5 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 18 01:12:21 UTC 2025
On branch cf/5438
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-amcheck-Fix-bt_index_parent_check-behavior-with-C.patch ===
Applying: amcheck: Fix bt_index_parent_check behavior with CREATE INDEX CONCURRENTLY
Using index info to reconstruct a base tree...
M	contrib/amcheck/meson.build
M	doc/src/sgml/amcheck.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/amcheck.sgml
Auto-merging contrib/amcheck/meson.build
CONFLICT (content): Merge conflict in contrib/amcheck/meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 amcheck: Fix bt_index_parent_check behavior with CREATE INDEX CONCURRENTLY
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/amcheck/meson.build
M	contrib/amcheck/verify_nbtree.c
M	doc/src/sgml/amcheck.sgml
Removing contrib/amcheck/t/006_cic_bt_index_parent_check.pl
=== using patch(1) to apply patch ./v3-0001-amcheck-Fix-bt_index_parent_check-behavior-with-C.patch ===
patching file contrib/amcheck/meson.build
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- saving rejects to file contrib/amcheck/meson.build.rej
patching file contrib/amcheck/t/006_cic_bt_index_parent_check.pl
patching file contrib/amcheck/verify_nbtree.c
patching file doc/src/sgml/amcheck.sgml
Unstaged changes after reset:
M	contrib/amcheck/verify_nbtree.c
M	doc/src/sgml/amcheck.sgml
Removing contrib/amcheck/meson.build.rej
Removing contrib/amcheck/t/006_cic_bt_index_parent_check.pl
=== using 'git apply' to apply patch ./v3-0001-amcheck-Fix-bt_index_parent_check-behavior-with-C.patch ===
Applied patch to 'contrib/amcheck/meson.build' with conflicts.
Falling back to direct application...
Applied patch to 'contrib/amcheck/verify_nbtree.c' cleanly.
Applied patch to 'doc/src/sgml/amcheck.sgml' cleanly.
U contrib/amcheck/meson.build
diff --cc contrib/amcheck/meson.build
index 1f0c347ed54,b040000dd55..00000000000
--- a/contrib/amcheck/meson.build
+++ b/contrib/amcheck/meson.build
@@@ -49,7 -49,7 +49,11 @@@ tests += 
        't/003_cic_2pc.pl',
        't/004_verify_nbtree_unique.pl',
        't/005_pitr.pl',
++<<<<<<< ours
 +      't/006_verify_gin.pl',
++=======
+       't/006_cic_bt_index_parent_check.pl',
++>>>>>>> theirs
      ],
    },
  }