=== Applying patches on top of PostgreSQL commit ID a3ea5330fcf47390c8ab420bbf433a97a54505d6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Nov  7 10:20:24 UTC 2025
On branch cf/6129
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-pg_ctl-use-USECS_PER_SEC-from-datatype-timestamp.h-i.patch ===
Applying: pg_ctl: use USECS_PER_SEC from datatype/timestamp.h instead of reinventing the wheel
Using index info to reconstruct a base tree...
M	src/bin/pg_basebackup/pg_createsubscriber.c
M	src/bin/pg_ctl/pg_ctl.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_ctl/pg_ctl.c
CONFLICT (content): Merge conflict in src/bin/pg_ctl/pg_ctl.c
Auto-merging src/bin/pg_basebackup/pg_createsubscriber.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_ctl: use USECS_PER_SEC from datatype/timestamp.h instead of reinventing the wheel
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_ctl/pg_ctl.c
=== using patch(1) to apply patch ./0001-pg_ctl-use-USECS_PER_SEC-from-datatype-timestamp.h-i.patch ===
patching file src/bin/pg_basebackup/pg_createsubscriber.c
Hunk #1 FAILED at 23.
Hunk #2 FAILED at 129.
Hunk #3 FAILED at 1610.
3 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_basebackup/pg_createsubscriber.c.rej
patching file src/bin/pg_ctl/pg_ctl.c
Hunk #1 FAILED at 26.
Hunk #2 FAILED at 68.
Hunk #3 succeeded at 595 (offset 1 line).
Hunk #4 FAILED at 700.
Hunk #5 FAILED at 739.
Hunk #6 FAILED at 772.
5 out of 6 hunks FAILED -- saving rejects to file src/bin/pg_ctl/pg_ctl.c.rej
Unstaged changes after reset:
M	src/bin/pg_ctl/pg_ctl.c
Removing src/bin/pg_basebackup/pg_createsubscriber.c.rej
Removing src/bin/pg_ctl/pg_ctl.c.rej
=== using 'git apply' to apply patch ./0001-pg_ctl-use-USECS_PER_SEC-from-datatype-timestamp.h-i.patch ===
Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' cleanly.
Applied patch to 'src/bin/pg_ctl/pg_ctl.c' with conflicts.
U src/bin/pg_ctl/pg_ctl.c
diff --cc src/bin/pg_ctl/pg_ctl.c
index 4f666d91036,b270c0c0d82..00000000000
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@@ -69,9 -69,7 +69,13 @@@ typedef enu
  
  #define DEFAULT_WAIT	60
  
++<<<<<<< ours
 +#define WAITS_PER_SEC	10
 +StaticAssertDecl(USECS_PER_SEC % WAITS_PER_SEC == 0,
 +				 "WAITS_PER_SEC must divide USECS_PER_SEC evenly");
++=======
+ #define WAITS_PER_SEC	10		/* should divide USECS_PER_SEC evenly */
++>>>>>>> theirs
  
  static bool do_wait = true;
  static int	wait_seconds = DEFAULT_WAIT;