=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 05:26:26 UTC 2025
On branch cf/4573
nothing to commit, working tree clean
=== applying 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 8a405ff122,dec0afdb29..0000000000
--- 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