=== Applying patches on top of PostgreSQL commit ID c13070a27b63d9ce4850d88a63bf889a6fde26f0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Aug 23 01:16:20 UTC 2025
On branch cf/5972
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-plpython-Remove-support-for-major-version-conflict-d.patch ===
Applying: plpython: Remove support for major version conflict detection
Using index info to reconstruct a base tree...
M	src/pl/plpython/plpy_main.c
Falling back to patching base and 3-way merge...
Auto-merging src/pl/plpython/plpy_main.c
CONFLICT (content): Merge conflict in src/pl/plpython/plpy_main.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 plpython: Remove support for major version conflict detection
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/pl/plpython/plpy_main.c
=== using patch(1) to apply patch ./0001-plpython-Remove-support-for-major-version-conflict-d.patch ===
patching file src/pl/plpython/plpy_main.c
Hunk #1 FAILED at 38.
Hunk #2 succeeded at 47 (offset 1 line).
Hunk #3 succeeded at 57 (offset 1 line).
Hunk #4 succeeded at 81 (offset 1 line).
Hunk #5 succeeded at 121 (offset 1 line).
Hunk #6 succeeded at 145 (offset 1 line).
Hunk #7 succeeded at 223 (offset 8 lines).
1 out of 7 hunks FAILED -- saving rejects to file src/pl/plpython/plpy_main.c.rej
Unstaged changes after reset:
M	src/pl/plpython/plpy_main.c
Removing src/pl/plpython/plpy_main.c.rej
=== using 'git apply' to apply patch ./0001-plpython-Remove-support-for-major-version-conflict-d.patch ===
Applied patch to 'src/pl/plpython/plpy_main.c' with conflicts.
U src/pl/plpython/plpy_main.c
diff --cc src/pl/plpython/plpy_main.c
index 70fc2c9257a,38f6365dd6b..00000000000
--- a/src/pl/plpython/plpy_main.c
+++ b/src/pl/plpython/plpy_main.c
@@@ -39,7 -38,8 +39,12 @@@ PG_FUNCTION_INFO_V1(plpython3_call_hand
  PG_FUNCTION_INFO_V1(plpython3_inline_handler);
  
  
++<<<<<<< ours
 +static PLyTrigType PLy_procedure_is_trigger(Form_pg_proc procStruct);
++=======
+ static void PLy_initialize(void);
+ static bool PLy_procedure_is_trigger(Form_pg_proc procStruct);
++>>>>>>> theirs
  static void plpython_error_callback(void *arg);
  static void plpython_inline_error_callback(void *arg);
  static void PLy_init_interp(void);