=== Applying patches on top of PostgreSQL commit ID 45fc51fcbf4534ea2f6f85e36f8155dbd5ba9851 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Oct 18 16:49:26 UTC 2026
On branch cf/7443
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-pg_upgrade-Prevent-premature-startup-of-the-new-c.patch ===
Applying: pg_upgrade: Prevent premature startup of the new cluster
Using index info to reconstruct a base tree...
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/t/002_pg_upgrade.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_upgrade/t/002_pg_upgrade.pl
Auto-merging src/bin/pg_upgrade/pg_upgrade.c
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/pg_upgrade.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: Prevent premature startup of the new cluster
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".
=== using patch(1) to apply patch ./v1-0001-pg_upgrade-Prevent-premature-startup-of-the-new-c.patch ===
patching file doc/src/sgml/ref/pgupgrade.sgml
patching file src/backend/utils/init/miscinit.c
patching file src/bin/pg_upgrade/pg_upgrade.c
Hunk #2 FAILED at 71.
Hunk #3 succeeded at 165 (offset 11 lines).
Hunk #4 succeeded at 275 (offset 11 lines).
Hunk #5 succeeded at 292 (offset 11 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/bin/pg_upgrade/pg_upgrade.c.rej
patching file src/bin/pg_upgrade/t/002_pg_upgrade.pl
Hunk #1 succeeded at 615 (offset -17 lines).
Hunk #2 succeeded at 634 (offset -17 lines).
patching file src/include/access/xlog_internal.h
Unstaged changes after reset:
M	doc/src/sgml/ref/pgupgrade.sgml
M	src/backend/utils/init/miscinit.c
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/t/002_pg_upgrade.pl
M	src/include/access/xlog_internal.h
Removing src/bin/pg_upgrade/pg_upgrade.c.rej
=== using 'git apply' to apply patch ./v1-0001-pg_upgrade-Prevent-premature-startup-of-the-new-c.patch ===
Applied patch to 'doc/src/sgml/ref/pgupgrade.sgml' cleanly.
Applied patch to 'src/backend/utils/init/miscinit.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.c' with conflicts.
Applied patch to 'src/bin/pg_upgrade/t/002_pg_upgrade.pl' cleanly.
Applied patch to 'src/include/access/xlog_internal.h' cleanly.
U src/bin/pg_upgrade/pg_upgrade.c
diff --cc src/bin/pg_upgrade/pg_upgrade.c
index 6d01084e4b0,74fa135c304..00000000000
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@@ -66,8 -70,9 +70,14 @@@ static void create_new_objects(void)
  static void copy_xact_xlog_xid(void);
  static void set_frozenxids(void);
  static void make_outputdirs(char *pgdata);
++<<<<<<< ours
 +static void check_bin_dirs(char *argv0);
 +static void check_clusters_stopped(void);
++=======
+ static void setup(char *argv0);
+ static void create_upgrade_in_progress_file(void);
+ static void remove_upgrade_in_progress_file(void);
++>>>>>>> theirs
  static void create_logical_replication_slots(void);
  static void create_conflict_detection_slot(void);