=== Applying patches on top of PostgreSQL commit ID 488ab592d9ea1b4c7d6e43389c34c4bbbcb8f0d4 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 30 19:38:28 UTC 2026
On branch cf/5214
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v24-0001-hstore-add-read-only-dot-notation-for-key-access.patch ===
Applying: hstore: add read-only dot notation for key access
Using index info to reconstruct a base tree...
M	contrib/hstore/expected/hstore.out
M	contrib/hstore/hstore_subs.c
M	contrib/hstore/sql/hstore.sql
M	src/backend/parser/parse_expr.c
M	src/backend/parser/parse_target.c
M	src/backend/utils/adt/arraysubs.c
M	src/backend/utils/adt/jsonbsubs.c
M	src/include/parser/parse_node.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/parser/parse_node.h
Auto-merging src/backend/utils/adt/jsonbsubs.c
Auto-merging src/backend/utils/adt/arraysubs.c
Auto-merging src/backend/parser/parse_target.c
Auto-merging src/backend/parser/parse_expr.c
Auto-merging contrib/hstore/sql/hstore.sql
Auto-merging contrib/hstore/hstore_subs.c
CONFLICT (content): Merge conflict in contrib/hstore/hstore_subs.c
Auto-merging contrib/hstore/expected/hstore.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 hstore: add read-only dot notation for key access
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 ./v24-0001-hstore-add-read-only-dot-notation-for-key-access.patch ===
patching file contrib/hstore/expected/hstore.out
Hunk #1 succeeded at 1606 (offset -1 lines).
Hunk #2 succeeded at 1632 (offset -1 lines).
patching file contrib/hstore/hstore_subs.c
Hunk #1 FAILED at 23.
Hunk #2 succeeded at 82 (offset 1 line).
Hunk #3 succeeded at 289 (offset 1 line).
1 out of 3 hunks FAILED -- saving rejects to file contrib/hstore/hstore_subs.c.rej
patching file contrib/hstore/sql/hstore.sql
Hunk #1 succeeded at 393 (offset -2 lines).
patching file src/backend/parser/parse_expr.c
Hunk #1 succeeded at 440 (offset 1 line).
Hunk #2 succeeded at 506 (offset 1 line).
patching file src/backend/parser/parse_node.c
patching file src/backend/parser/parse_target.c
Hunk #1 succeeded at 928 (offset 6 lines).
Hunk #2 succeeded at 943 (offset 6 lines).
patching file src/backend/utils/adt/arraysubs.c
Hunk #1 succeeded at 542 (offset 1 line).
Hunk #2 succeeded at 570 (offset 1 line).
patching file src/backend/utils/adt/jsonbsubs.c
Hunk #1 succeeded at 404 (offset 1 line).
patching file src/include/nodes/subscripting.h
patching file src/include/parser/parse_node.h
Hunk #1 succeeded at 378 (offset 16 lines).
Unstaged changes after reset:
M	contrib/hstore/expected/hstore.out
M	contrib/hstore/hstore_subs.c
M	contrib/hstore/sql/hstore.sql
M	src/backend/parser/parse_expr.c
M	src/backend/parser/parse_node.c
M	src/backend/parser/parse_target.c
M	src/backend/utils/adt/arraysubs.c
M	src/backend/utils/adt/jsonbsubs.c
M	src/include/nodes/subscripting.h
M	src/include/parser/parse_node.h
Removing contrib/hstore/hstore_subs.c.rej
=== using 'git apply' to apply patch ./v24-0001-hstore-add-read-only-dot-notation-for-key-access.patch ===
Applied patch to 'contrib/hstore/expected/hstore.out' cleanly.
Applied patch to 'contrib/hstore/hstore_subs.c' with conflicts.
Applied patch to 'contrib/hstore/sql/hstore.sql' cleanly.
Applied patch to 'src/backend/parser/parse_expr.c' cleanly.
Applied patch to 'src/backend/parser/parse_node.c' cleanly.
Applied patch to 'src/backend/parser/parse_target.c' cleanly.
Applied patch to 'src/backend/utils/adt/arraysubs.c' cleanly.
Applied patch to 'src/backend/utils/adt/jsonbsubs.c' cleanly.
Applied patch to 'src/include/nodes/subscripting.h' cleanly.
Applied patch to 'src/include/parser/parse_node.h' cleanly.
U contrib/hstore/hstore_subs.c
diff --cc contrib/hstore/hstore_subs.c
index 56e0858c1a6,854a675937e..00000000000
--- a/contrib/hstore/hstore_subs.c
+++ b/contrib/hstore/hstore_subs.c
@@@ -23,9 -23,10 +23,14 @@@
   */
  #include "postgres.h"
  
++<<<<<<< ours
 +#include "catalog/pg_type_d.h"
++=======
+ #include "catalog/pg_collation_d.h"
++>>>>>>> theirs
  #include "executor/execExpr.h"
  #include "hstore.h"
+ #include "nodes/makefuncs.h"
  #include "nodes/nodeFuncs.h"
  #include "nodes/subscripting.h"
  #include "parser/parse_coerce.h"