=== Applying patches on top of PostgreSQL commit ID 2e66cae935c2e0f7ce9bab6b65ddeb7806f4de7c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Sep 18 05:55:21 UTC 2025
On branch cf/4573
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6-0001-Improve-pg_ctl-postmaster-process-check-on-Window.patch ===
Applying: Improve pg_ctl postmaster process check on Windows
Using index info to reconstruct a base tree...
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
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve pg_ctl postmaster process check on Windows
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 ./v6-0001-Improve-pg_ctl-postmaster-process-check-on-Window.patch ===
patching file src/bin/pg_ctl/pg_ctl.c
Hunk #1 succeeded at 132 (offset 1 line).
Hunk #2 succeeded at 143 (offset 1 line).
Hunk #3 succeeded at 611 (offset 1 line).
Hunk #4 FAILED at 624.
Hunk #5 succeeded at 1965 (offset 10 lines).
1 out of 5 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_ctl/pg_ctl.c.rej
=== using 'git apply' to apply patch ./v6-0001-Improve-pg_ctl-postmaster-process-check-on-Window.patch ===
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 8a405ff122c,dec0afdb29a..00000000000
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@@ -618,15 -623,9 +624,21 @@@ wait_for_postmaster_start(pid_t pm_pid
  			 * Allow 2 seconds slop for possible cross-process clock skew.
  			 */
  			pmpid = atol(optlines[LOCK_FILE_LINE_PID - 1]);
++<<<<<<< ours
 +			pmstart = atoll(optlines[LOCK_FILE_LINE_START_TIME - 1]);
 +			if (pmstart >= start_time - 2 &&
 +#ifndef WIN32
 +				pmpid == pm_pid
 +#else
 +			/* Windows can only reject standalone-backend PIDs */
 +				pmpid > 0
 +#endif
 +				)
++=======
+ 			pmstart = atol(optlines[LOCK_FILE_LINE_START_TIME - 1]);
+ 
+ 			if (pmstart >= start_time - 2 && pmpid == wait_pid)
++>>>>>>> theirs
  			{
  				/*
  				 * OK, seems to be a valid pidfile from our child.  Check the