=== Applying patches on top of PostgreSQL commit ID 955f5506863dce0a3416e3fae7c3297dbbaa946d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Dec 23 13:13:19 UTC 2025
On branch cf/6311
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Add-CONNECTING-CONNECTED-states-to-walreceiver.patch ===
Applying: Add CONNECTING/CONNECTED states to walreceiver
=== using 'git am' to apply patch ./v3-0001-Add-WALRCV_CONNECTING-and-WALRCV_CONNECTED-states.patch ===
Applying: Add WALRCV_CONNECTING and WALRCV_CONNECTED states to walreceiver
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/replication/walreceiver.c
M	src/backend/replication/walreceiverfuncs.c
M	src/include/replication/walreceiver.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/replication/walreceiver.h
Auto-merging src/backend/replication/walreceiverfuncs.c
Auto-merging src/backend/replication/walreceiver.c
CONFLICT (content): Merge conflict in src/backend/replication/walreceiver.c
Auto-merging src/backend/access/transam/xlogrecovery.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 Add WALRCV_CONNECTING and WALRCV_CONNECTED states to walreceiver
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/access/transam/xlogrecovery.c
M	src/backend/replication/walreceiver.c
M	src/backend/replication/walreceiverfuncs.c
M	src/include/replication/walreceiver.h
=== using patch(1) to apply patch ./v3-0001-Add-WALRCV_CONNECTING-and-WALRCV_CONNECTED-states.patch ===
patching file src/backend/access/transam/xlogrecovery.c
Hunk #2 succeeded at 1840 (offset 10 lines).
Hunk #3 succeeded at 3716 (offset 10 lines).
patching file src/backend/replication/walreceiver.c
Hunk #1 succeeded at 208 with fuzz 2 (offset 3 lines).
Hunk #2 FAILED at 216.
Hunk #3 succeeded at 399 (offset 3 lines).
Hunk #4 FAILED at 695.
Hunk #5 FAILED at 798.
Hunk #6 FAILED at 1380.
4 out of 6 hunks FAILED -- saving rejects to file src/backend/replication/walreceiver.c.rej
patching file src/backend/replication/walreceiverfuncs.c
Hunk #1 FAILED at 179.
Hunk #2 FAILED at 211.
2 out of 2 hunks FAILED -- saving rejects to file src/backend/replication/walreceiverfuncs.c.rej
patching file src/include/replication/walreceiver.h
Hunk #1 FAILED at 47.
Hunk #2 succeeded at 495 (offset 3 lines).
1 out of 2 hunks FAILED -- saving rejects to file src/include/replication/walreceiver.h.rej
Unstaged changes after reset:
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/replication/walreceiver.c
M	src/include/replication/walreceiver.h
Removing src/backend/replication/walreceiver.c.rej
Removing src/backend/replication/walreceiverfuncs.c.rej
Removing src/include/replication/walreceiver.h.rej
=== using 'git apply' to apply patch ./v3-0001-Add-WALRCV_CONNECTING-and-WALRCV_CONNECTED-states.patch ===
Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly.
Applied patch to 'src/backend/replication/walreceiver.c' with conflicts.
Applied patch to 'src/backend/replication/walreceiverfuncs.c' cleanly.
Applied patch to 'src/include/replication/walreceiver.h' cleanly.
U src/backend/replication/walreceiver.c
diff --cc src/backend/replication/walreceiver.c
index 345deed9093,fc8d0cd7804..00000000000
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@@ -205,9 -204,9 +205,11 @@@ WalReceiverMain(const void *startup_dat
  			/* The usual case */
  			break;
  
 +		case WALRCV_CONNECTING:
 +		case WALRCV_CONNECTED:
  		case WALRCV_WAITING:
+ 		case WALRCV_CONNECTING:
+ 		case WALRCV_CONNECTED:
  		case WALRCV_STREAMING:
  		case WALRCV_RESTARTING:
  		default:
@@@ -801,9 -797,9 +808,15 @@@ WalRcvDie(int code, Datum arg
  
  	/* Mark ourselves inactive in shared memory */
  	SpinLockAcquire(&walrcv->mutex);
++<<<<<<< ours
 +	Assert(walrcv->walRcvState == WALRCV_CONNECTING ||
 +		   walrcv->walRcvState == WALRCV_CONNECTED ||
 +		   walrcv->walRcvState == WALRCV_STREAMING ||
++=======
+ 	Assert(walrcv->walRcvState == WALRCV_STREAMING ||
+ 		   walrcv->walRcvState == WALRCV_CONNECTING ||
+ 		   walrcv->walRcvState == WALRCV_CONNECTED ||
++>>>>>>> theirs
  		   walrcv->walRcvState == WALRCV_RESTARTING ||
  		   walrcv->walRcvState == WALRCV_STARTING ||
  		   walrcv->walRcvState == WALRCV_WAITING ||