=== Applying patches on top of PostgreSQL commit ID 23792d7381583d04c4bbd0a8507566401ec013d3 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Nov 15 23:27:22 UTC 2025
On branch cf/5550
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-WaitLSNWakeup-fast-path-check-for-InvalidXLog.patch ===
Applying: Fix WaitLSNWakeup() fast-path check for InvalidXLogRecPtr
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogwait.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
=== using 'git am' to apply patch ./v1-0001-Fix-incorrect-function-name-in-comments.patch ===
Applying: Fix incorrect function name in comments
Using index info to reconstruct a base tree...
M	src/backend/commands/wait.c
M	src/include/access/xlogwait.h
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/wait.c
CONFLICT (content): Merge conflict in src/backend/commands/wait.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 Fix incorrect function name in comments
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/backend/commands/wait.c
=== using patch(1) to apply patch ./v1-0001-Fix-incorrect-function-name-in-comments.patch ===
patching file src/backend/commands/wait.c
Hunk #1 FAILED at 143.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/commands/wait.c.rej
patching file src/include/access/xlogwait.h
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file src/include/access/xlogwait.h.rej
Removing src/backend/commands/wait.c.rej
Removing src/include/access/xlogwait.h.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-incorrect-function-name-in-comments.patch ===
Applied patch to 'src/backend/commands/wait.c' with conflicts.
Applied patch to 'src/include/access/xlogwait.h' cleanly.
U src/backend/commands/wait.c
diff --cc src/backend/commands/wait.c
index a37bddaefb2,9c4764cf896..00000000000
--- a/src/backend/commands/wait.c
+++ b/src/backend/commands/wait.c
@@@ -143,7 -143,8 +143,12 @@@ ExecWaitStmt(ParseState *pstate, WaitSt
  	waitLSNResult = WaitForLSN(WAIT_LSN_TYPE_REPLAY, lsn, timeout);
  
  	/*
++<<<<<<< ours
 +	 * Process the result of WaitForLSN().  Throw appropriate error if needed.
++=======
+ 	 * Process the result of WaitForLSN().  Throw appropriate error if
+ 	 * needed.
++>>>>>>> theirs
  	 */
  	switch (waitLSNResult)
  	{