=== Applying patches on top of PostgreSQL commit ID 3c472a18296e473270b6ff611b898592263a6ed1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Mar  9 11:10:23 UTC 2025
On branch cf/5282
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-file_fdw-Report-tuples-processed-and-skipped-for-.patch ===
Applying: file_fdw: Report tuples processed and skipped for COPY progress.
Using index info to reconstruct a base tree...
M	contrib/file_fdw/file_fdw.c
Falling back to patching base and 3-way merge...
Auto-merging contrib/file_fdw/file_fdw.c
CONFLICT (content): Merge conflict in contrib/file_fdw/file_fdw.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 file_fdw: Report tuples processed and skipped for COPY progress.
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/file_fdw/file_fdw.c
=== using patch(1) to apply patch ./v1-0001-file_fdw-Report-tuples-processed-and-skipped-for-.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 ./v1-0001-file_fdw-Report-tuples-processed-and-skipped-for-.patch ===
Applied patch to 'contrib/file_fdw/file_fdw.c' with conflicts.
U contrib/file_fdw/file_fdw.c
diff --cc contrib/file_fdw/file_fdw.c
index bf707c812ed,6b6bf7ff180..00000000000
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@@ -25,7 -25,7 +25,11 @@@
  #include "commands/copyfrom_internal.h"
  #include "commands/defrem.h"
  #include "commands/explain.h"
++<<<<<<< ours
 +#include "commands/explain_format.h"
++=======
+ #include "commands/progress.h"
++>>>>>>> theirs
  #include "commands/vacuum.h"
  #include "foreign/fdwapi.h"
  #include "foreign/foreign.h"