=== Applying patches on top of PostgreSQL commit ID 04f9ea372a20c0346ad6d78de348543375761aaa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr 20 10:30:27 UTC 2026
On branch cf/6309
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Add-SQL-level-datum-equality-tests.patch ===
Applying: Add SQL-level datum equality tests
Using index info to reconstruct a base tree...
M	src/include/catalog/pg_proc.dat
M	src/test/regress/expected/opr_sanity.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/opr_sanity.out
CONFLICT (content): Merge conflict in src/test/regress/expected/opr_sanity.out
Auto-merging src/include/catalog/pg_proc.dat
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add SQL-level datum equality tests
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 ./v2-0001-Add-SQL-level-datum-equality-tests.patch ===
patching file doc/src/sgml/func/func-comparison.sgml
patching file src/backend/utils/adt/pseudotypes.c
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 12769 (offset -82 lines).
patching file src/test/regress/expected/opr_sanity.out
Hunk #1 FAILED at 887.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/opr_sanity.out.rej
Unstaged changes after reset:
M	doc/src/sgml/func/func-comparison.sgml
M	src/backend/utils/adt/pseudotypes.c
M	src/include/catalog/pg_proc.dat
Removing src/test/regress/expected/opr_sanity.out.rej
=== using 'git apply' to apply patch ./v2-0001-Add-SQL-level-datum-equality-tests.patch ===
Applied patch to 'doc/src/sgml/func/func-comparison.sgml' cleanly.
Applied patch to 'src/backend/utils/adt/pseudotypes.c' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/test/regress/expected/opr_sanity.out' with conflicts.
U src/test/regress/expected/opr_sanity.out
diff --cc src/test/regress/expected/opr_sanity.out
index cfdc6b1a17a,df25551c48d..00000000000
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@@ -887,8 -887,7 +887,12 @@@ oid8le(oid8,oid8
  oid8gt(oid8,oid8)
  oid8ge(oid8,oid8)
  btoid8cmp(oid8,oid8)
++<<<<<<< ours
 +tid_block(tid)
 +tid_offset(tid)
++=======
+ pg_datum_image_equal(anyelement,anyelement)
++>>>>>>> theirs
  -- Check that functions without argument are not marked as leakproof.
  SELECT p1.oid::regprocedure
  FROM pg_proc p1 JOIN pg_namespace pn