=== Applying patches on top of PostgreSQL commit ID 08ccd56ac765496a152ba50cf0ae743c39396f52 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Mar 29 20:11:23 UTC 2025
On branch cf/5206
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-pg_upgrade-Support-for-upgrading-to-checksums-ena.patch ===
Applying: pg_upgrade: Support for upgrading to checksums enabled
Using index info to reconstruct a base tree...
M	src/bin/pg_upgrade/controldata.c
M	src/bin/pg_upgrade/file.c
M	src/bin/pg_upgrade/option.c
M	src/bin/pg_upgrade/pg_upgrade.h
M	src/bin/pg_upgrade/relfilenumber.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_upgrade/relfilenumber.c
Auto-merging src/bin/pg_upgrade/pg_upgrade.h
Auto-merging src/bin/pg_upgrade/option.c
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/option.c
Auto-merging src/bin/pg_upgrade/file.c
Auto-merging src/bin/pg_upgrade/controldata.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_upgrade: Support for upgrading to checksums enabled
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_upgrade/controldata.c
M	src/bin/pg_upgrade/file.c
M	src/bin/pg_upgrade/option.c
M	src/bin/pg_upgrade/pg_upgrade.h
M	src/bin/pg_upgrade/relfilenumber.c
=== using patch(1) to apply patch ./v2-0001-pg_upgrade-Support-for-upgrading-to-checksums-ena.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 ./v2-0001-pg_upgrade-Support-for-upgrading-to-checksums-ena.patch ===
Applied patch to 'src/bin/pg_upgrade/controldata.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/file.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/option.c' with conflicts.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly.
Applied patch to 'src/bin/pg_upgrade/relfilenumber.c' cleanly.
U src/bin/pg_upgrade/option.c
diff --cc src/bin/pg_upgrade/option.c
index 7fd7f1d33fc,a0f50c10159..00000000000
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@@ -62,7 -62,7 +62,11 @@@ parseCommandLine(int argc, char *argv[]
  		{"sync-method", required_argument, NULL, 4},
  		{"no-statistics", no_argument, NULL, 5},
  		{"set-char-signedness", required_argument, NULL, 6},
++<<<<<<< ours
 +		{"swap", no_argument, NULL, 7},
++=======
+ 		{"update-checksums", no_argument, NULL, 7},
++>>>>>>> theirs
  
  		{NULL, 0, NULL, 0}
  	};
@@@ -231,7 -231,7 +235,11 @@@
  				break;
  
  			case 7:
++<<<<<<< ours
 +				user_opts.transfer_mode = TRANSFER_MODE_SWAP;
++=======
+ 				user_opts.update_checksums = true;
++>>>>>>> theirs
  				break;
  
  			default: