=== Applying patches on top of PostgreSQL commit ID 5941946d0934b9eccb0d5bfebd40b155249a0130 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 19 23:26:19 UTC 2025
On branch cf/5508
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-pg_combinebackup-Add-k-link-option.patch ===
Applying: pg_combinebackup: Add -k, --link option.
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/pg_combinebackup.sgml
M	src/bin/pg_combinebackup/copy_file.c
M	src/bin/pg_combinebackup/copy_file.h
M	src/bin/pg_combinebackup/meson.build
M	src/bin/pg_combinebackup/pg_combinebackup.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_combinebackup/copy_file.c
CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/copy_file.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 pg_combinebackup: Add -k, --link option.
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/bin/pg_combinebackup/copy_file.c
=== using patch(1) to apply patch ./v7-0001-pg_combinebackup-Add-k-link-option.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 ./v7-0001-pg_combinebackup-Add-k-link-option.patch ===
Applied patch to 'doc/src/sgml/ref/pg_combinebackup.sgml' cleanly.
Applied patch to 'src/bin/pg_combinebackup/copy_file.c' with conflicts.
Applied patch to 'src/bin/pg_combinebackup/copy_file.h' cleanly.
Applied patch to 'src/bin/pg_combinebackup/meson.build' cleanly.
Applied patch to 'src/bin/pg_combinebackup/pg_combinebackup.c' cleanly.
Performing three-way merge...
Applied patch to 'src/bin/pg_combinebackup/t/010_hardlink.pl' cleanly.
U src/bin/pg_combinebackup/copy_file.c
diff --cc src/bin/pg_combinebackup/copy_file.c
index b0c94f6ee31,97ecda5a66d..00000000000
--- a/src/bin/pg_combinebackup/copy_file.c
+++ b/src/bin/pg_combinebackup/copy_file.c
@@@ -72,10 -72,9 +72,16 @@@ copy_file(const char *src, const char *
  	}
  
  #ifdef WIN32
++<<<<<<< ours
 +
 +	/*
 +	 * We have no specific switch to enable CopyFile on Windows, because it's
 +	 * supported (as far as we know) on all Windows machines. So,
++=======
+ 	/*
+ 	 * We have no specific switch to enable CopyFile on Windows, because
+ 	 * it's supported (as far as we know) on all Windows machines. So,
++>>>>>>> theirs
  	 * automatically enable it unless some other strategy was selected.
  	 */
  	if (copy_method == COPY_METHOD_COPY)