=== Applying patches on top of PostgreSQL commit ID e5aeed4b8020424fa882c3d1969d00c2b2d8cf30 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 20 08:40:27 UTC 2025
On branch cf/5128
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Allow-partition-wise-join-when-reltarget-contains-wh.patch ===
Applying: Allow partition-wise join when reltarget contains whole row vars
=== using 'git am' to apply patch ./0002-Handle-ConvertRowtypeExprs-in-pull_vars_clause.patch ===
Applying: Handle ConvertRowtypeExprs in pull_vars_clause().
error: sha1 information is lacking or useless (src/backend/optimizer/plan/setrefs.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Handle ConvertRowtypeExprs in pull_vars_clause().
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 ./0002-Handle-ConvertRowtypeExprs-in-pull_vars_clause.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./0002-Handle-ConvertRowtypeExprs-in-pull_vars_clause.patch ===
Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/optimizer/util/var.c' cleanly.
Applied patch to 'src/include/nodes/nodeFuncs.h' cleanly.
Applied patch to 'src/include/optimizer/optimizer.h' with conflicts.
U src/include/optimizer/optimizer.h
diff --cc src/include/optimizer/optimizer.h
index 78e05d88c8e,b1f83fafdc8..00000000000
--- a/src/include/optimizer/optimizer.h
+++ b/src/include/optimizer/optimizer.h
@@@ -192,8 -192,8 +192,13 @@@ extern SortGroupClause *get_sortgroupre
  											 * output list */
  #define PVC_RECURSE_PLACEHOLDERS	0x0020	/* recurse into PlaceHolderVar
  											 * arguments */
++<<<<<<< ours
 +#define PVC_INCLUDE_CONVERTROWTYPES	0x0040	/* include ConvertRowtypeExprs in
 +											 * output list */
++=======
+ #define PVC_INCLUDE_CONVERTROWTYPES	0x0040     /* include ConvertRowtypeExprs in
+ 							* output list */
++>>>>>>> theirs
  
  extern Bitmapset *pull_varnos(PlannerInfo *root, Node *node);
  extern Bitmapset *pull_varnos_of_level(PlannerInfo *root, Node *node, int levelsup);