=== Applying patches on top of PostgreSQL commit ID f7c566a1a276c5f228891c7599df1c0b8878eb35 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 10 18:04:23 UTC 2025
On branch cf/5525
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-enable-fetching-explain-plans-from-foreign-server.patch ===
Applying: enable fetching explain plans from foreign server
.git/rebase-apply/patch:285: trailing whitespace.
static void 
.git/rebase-apply/patch:352: trailing whitespace.
			} 
.git/rebase-apply/patch:668: trailing whitespace.
	
.git/rebase-apply/patch:718: indent with spaces.
    DefineCustomBoolVariable("postgres_fdw.auto_explain_enabled",
.git/rebase-apply/patch:816: trailing whitespace.
							 NULL);	
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/Makefile
M	contrib/postgres_fdw/connection.c
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/option.c
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/postgres_fdw.h
M	contrib/postgres_fdw/sql/postgres_fdw.sql
M	src/backend/commands/explain.c
M	src/include/commands/explain.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/commands/explain.h
CONFLICT (content): Merge conflict in src/include/commands/explain.h
Auto-merging src/backend/commands/explain.c
Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql
Auto-merging contrib/postgres_fdw/postgres_fdw.h
Auto-merging contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/postgres_fdw/option.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
Auto-merging contrib/postgres_fdw/connection.c
Auto-merging contrib/postgres_fdw/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 enable fetching explain plans from foreign server
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	contrib/postgres_fdw/Makefile
M	contrib/postgres_fdw/connection.c
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/option.c
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/postgres_fdw.h
M	contrib/postgres_fdw/sql/postgres_fdw.sql
M	src/backend/commands/explain.c
M	src/include/commands/explain.h
Removing contrib/postgres_fdw/postgres_fdw_auto_explain.c
Removing src/include/pg_config_ext.h
Removing src/include/stamp-ext-h
=== using patch(1) to apply patch ./0001-enable-fetching-explain-plans-from-foreign-server.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 ./0001-enable-fetching-explain-plans-from-foreign-server.patch ===
/work/patches/./0001-enable-fetching-explain-plans-from-foreign-server.patch:290: trailing whitespace.
static void 
/work/patches/./0001-enable-fetching-explain-plans-from-foreign-server.patch:357: trailing whitespace.
			} 
/work/patches/./0001-enable-fetching-explain-plans-from-foreign-server.patch:673: trailing whitespace.
	
/work/patches/./0001-enable-fetching-explain-plans-from-foreign-server.patch:723: indent with spaces.
    DefineCustomBoolVariable("postgres_fdw.auto_explain_enabled",
/work/patches/./0001-enable-fetching-explain-plans-from-foreign-server.patch:821: trailing whitespace.
							 NULL);	
Applied patch to 'contrib/postgres_fdw/Makefile' cleanly.
Applied patch to 'contrib/postgres_fdw/connection.c' cleanly.
Applied patch to 'contrib/postgres_fdw/expected/postgres_fdw.out' cleanly.
Applied patch to 'contrib/postgres_fdw/option.c' cleanly.
Applied patch to 'contrib/postgres_fdw/postgres_fdw.c' cleanly.
Applied patch to 'contrib/postgres_fdw/postgres_fdw.h' cleanly.
Falling back to direct application...
Applied patch to 'contrib/postgres_fdw/sql/postgres_fdw.sql' cleanly.
Applied patch to 'src/backend/commands/explain.c' cleanly.
Applied patch to 'src/include/commands/explain.h' with conflicts.
Falling back to direct application...
Falling back to direct application...
U src/include/commands/explain.h
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.
diff --cc src/include/commands/explain.h
index 64547bd9b9c,d1faac97e8f..00000000000
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@@ -120,4 -118,32 +120,35 @@@ extern void ExplainPrintJITSummary(Expl
  extern void ExplainQueryText(ExplainState *es, QueryDesc *queryDesc);
  extern void ExplainQueryParameters(ExplainState *es, ParamListInfo params, int maxlen);
  
++<<<<<<< ours
++=======
+ extern void ExplainBeginOutput(ExplainState *es);
+ extern void ExplainEndOutput(ExplainState *es);
+ extern void ExplainSeparatePlans(ExplainState *es);
+ 
+ extern void ExplainPropertyList(const char *qlabel, List *data,
+ 								ExplainState *es);
+ extern void ExplainPropertyListNested(const char *qlabel, List *data,
+ 									  ExplainState *es);
+ extern void ExplainPropertyText(const char *qlabel, const char *value,
+ 								ExplainState *es);
+ extern void ExplainPropertyInteger(const char *qlabel, const char *unit,
+ 								   int64 value, ExplainState *es);
+ extern void ExplainPropertyUInteger(const char *qlabel, const char *unit,
+ 									uint64 value, ExplainState *es);
+ extern void ExplainPropertyFloat(const char *qlabel, const char *unit,
+ 								 double value, int ndigits, ExplainState *es);
+ extern void ExplainPropertyBool(const char *qlabel, bool value,
+ 								ExplainState *es);
+ 
+ extern void ExplainOpenGroup(const char *objtype, const char *labelname,
+ 							 bool labeled, ExplainState *es);
+ extern void ExplainCloseGroup(const char *objtype, const char *labelname,
+ 							  bool labeled, ExplainState *es);
+ 
+ extern DestReceiver *CreateExplainSerializeDestReceiver(ExplainState *es);
+ 
+ extern ExplainState *ParseExplainStmtOptions(ParseState *pstate, List *options);
+ 
++>>>>>>> theirs
  #endif							/* EXPLAIN_H */