=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 16 19:40:23 UTC 2026
On branch cf/6396
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-plpython-Remove-commented-out-code.patch ===
Applying: plpython: Remove commented out code
Using index info to reconstruct a base tree...
M	src/pl/plpython/plpy_plpymodule.c
Falling back to patching base and 3-way merge...
Auto-merging src/pl/plpython/plpy_plpymodule.c
CONFLICT (content): Merge conflict in src/pl/plpython/plpy_plpymodule.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 commented out code
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_plpymodule.c
=== using patch(1) to apply patch ./v2-0001-plpython-Remove-commented-out-code.patch ===
patching file src/pl/plpython/plpy_plpymodule.c
Hunk #1 FAILED at 153.
1 out of 1 hunk FAILED -- saving rejects to file src/pl/plpython/plpy_plpymodule.c.rej
Removing src/pl/plpython/plpy_plpymodule.c.rej
=== using 'git apply' to apply patch ./v2-0001-plpython-Remove-commented-out-code.patch ===
Applied patch to 'src/pl/plpython/plpy_plpymodule.c' with conflicts.
U src/pl/plpython/plpy_plpymodule.c
diff --cc src/pl/plpython/plpy_plpymodule.c
index 72806c17e17,66781291519..00000000000
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@@ -138,7 -151,19 +138,23 @@@ PyInit_plpy(void
  	PLy_subtransaction_init_type();
  	PLy_cursor_init_type();
  
++<<<<<<< ours
 +	return m;
++=======
+ 	PyModule_Create(&PLy_module);
+ 
+ 	/*
+ 	 * initialize main module, and add plpy
+ 	 */
+ 	main_mod = PyImport_AddModule("__main__");
+ 	main_dict = PyModule_GetDict(main_mod);
+ 	plpy_mod = PyImport_AddModule("plpy");
+ 	if (plpy_mod == NULL)
+ 		PLy_elog(ERROR, "could not import \"plpy\" module");
+ 	PyDict_SetItemString(main_dict, "plpy", plpy_mod);
+ 	if (PyErr_Occurred())
+ 		PLy_elog(ERROR, "could not import \"plpy\" module");
++>>>>>>> theirs
  }
  
  static void