=== Applying patches on top of PostgreSQL commit ID 843e50208a31b9e17e9ab530c93a158425cfb8ba ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Oct 11 01:57:20 UTC 2025
On branch cf/5759
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-enhance-json_array-json_object-expression-is-immutable-or.patch ===
Applying: enhance json_array, json_object expression is immutable or not
Using index info to reconstruct a base tree...
M	src/backend/optimizer/util/clauses.c
M	src/backend/utils/adt/json.c
M	src/test/regress/expected/sqljson.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/sqljson.out
Auto-merging src/backend/utils/adt/json.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/json.c
Auto-merging src/backend/optimizer/util/clauses.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 enhance json_array, json_object expression is immutable or not
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/backend/optimizer/util/clauses.c
M	src/backend/utils/adt/json.c
M	src/backend/utils/adt/jsonb.c
M	src/include/utils/json.h
M	src/include/utils/jsonb.h
M	src/test/regress/expected/sqljson.out
M	src/test/regress/sql/sqljson.sql
=== using patch(1) to apply patch ./v2-0001-enhance-json_array-json_object-expression-is-immutable-or.patch ===
patching file src/backend/optimizer/util/clauses.c
Hunk #1 succeeded at 409 (offset 3 lines).
patching file src/backend/utils/adt/json.c
Hunk #1 FAILED at 13.
Hunk #2 succeeded at 29 (offset 1 line).
Hunk #3 succeeded at 694 (offset 1 line).
Hunk #4 succeeded at 753 (offset 1 line).
1 out of 4 hunks FAILED -- saving rejects to file src/backend/utils/adt/json.c.rej
patching file src/backend/utils/adt/jsonb.c
patching file src/include/utils/json.h
patching file src/include/utils/jsonb.h
patching file src/test/regress/expected/sqljson.out
patching file src/test/regress/sql/sqljson.sql
Unstaged changes after reset:
M	src/backend/optimizer/util/clauses.c
M	src/backend/utils/adt/json.c
M	src/backend/utils/adt/jsonb.c
M	src/include/utils/json.h
M	src/include/utils/jsonb.h
M	src/test/regress/expected/sqljson.out
M	src/test/regress/sql/sqljson.sql
Removing src/backend/utils/adt/json.c.rej
=== using 'git apply' to apply patch ./v2-0001-enhance-json_array-json_object-expression-is-immutable-or.patch ===
Applied patch to 'src/backend/optimizer/util/clauses.c' cleanly.
Applied patch to 'src/backend/utils/adt/json.c' with conflicts.
Applied patch to 'src/backend/utils/adt/jsonb.c' cleanly.
Applied patch to 'src/include/utils/json.h' cleanly.
Applied patch to 'src/include/utils/jsonb.h' cleanly.
Applied patch to 'src/test/regress/expected/sqljson.out' cleanly.
Applied patch to 'src/test/regress/sql/sqljson.sql' cleanly.
U src/backend/utils/adt/json.c
diff --cc src/backend/utils/adt/json.c
index 14f5cb498fc,36b6920e850..00000000000
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@@ -13,7 -13,7 +13,11 @@@
   */
  #include "postgres.h"
  
++<<<<<<< ours
 +#include "access/htup_details.h"
++=======
+ #include "access/relation.h"
++>>>>>>> theirs
  #include "catalog/pg_proc.h"
  #include "catalog/pg_type.h"
  #include "common/hashfn.h"