=== Applying patches on top of PostgreSQL commit ID 8e4d72573cc8b8bdc081661c0a3a76d6573eaa38 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Feb 20 16:51:25 UTC 2025
On branch cf/5369
nothing to commit, working tree clean
=== applying patch ./v2-0001-Export-walkdir.patch
Applied patch to 'src/common/file_utils.c' cleanly.
Applied patch to 'src/include/common/file_utils.h' cleanly.
[cf/5369 88cb674f5b] Export walkdir().
 Author: Nathan Bossart <nathan@postgresql.org>
 Date: Tue Nov 5 15:59:51 2024 -0600
 2 files changed, 4 insertions(+), 4 deletions(-)
=== applying patch ./v2-0002-Add-void-arg-parameter-to-walkdir-that-is-passed-.patch
Applied patch to 'src/bin/pg_basebackup/walmethods.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_custom.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_tar.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly.
Applied patch to 'src/common/file_utils.c' cleanly.
Applied patch to 'src/include/common/file_utils.h' cleanly.
[cf/5369 e1ef493a97] Add "void *arg" parameter to walkdir() that is passed to function.
 Author: Nathan Bossart <nathan@postgresql.org>
 Date: Wed Nov 6 13:59:39 2024 -0600
 6 files changed, 29 insertions(+), 29 deletions(-)
=== applying patch ./v2-0003-Introduce-catalog-swap-mode-for-pg_upgrade.patch
Applied patch to 'src/bin/pg_upgrade/check.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.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/bin/pg_upgrade/option.c
diff --cc src/bin/pg_upgrade/option.c
index 3fd487086a,64091a54c4..0000000000
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@@ -60,7 -60,7 +60,11 @@@ parseCommandLine(int argc, char *argv[]
  		{"copy", no_argument, NULL, 2},
  		{"copy-file-range", no_argument, NULL, 3},
  		{"sync-method", required_argument, NULL, 4},
++<<<<<<< ours
 +		{"no-statistics", no_argument, NULL, 5},
++=======
+ 		{"catalog-swap", no_argument, NULL, 5},
++>>>>>>> theirs
  
  		{NULL, 0, NULL, 0}
  	};
@@@ -215,7 -214,7 +219,11 @@@
  				break;
  
  			case 5:
++<<<<<<< ours
 +				user_opts.do_statistics = false;
++=======
+ 				user_opts.transfer_mode = TRANSFER_MODE_CATALOG_SWAP;
++>>>>>>> theirs
  				break;
  
  			default: