=== Applying patches on top of PostgreSQL commit ID 228c3708685542d34e6f02c74240656327a5c622 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jul 23 14:58:20 UTC 2025
On branch cf/5837
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v6_HEAD-0001-Fix-duplicate-insert-during-pg_createsubscri.patch ===
Applying: Fix duplicate insert during pg_createsubscriber
=== using 'git am' to apply patch ./v6_REL_17-0001-Fix-duplicate-insert-during-pg_createsubsc.patch ===
Applying: Fix duplicate insert during pg_createsubscriber
Using index info to reconstruct a base tree...
M	src/bin/pg_basebackup/pg_createsubscriber.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_basebackup/pg_createsubscriber.c
CONFLICT (content): Merge conflict in 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 Fix duplicate insert during pg_createsubscriber
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_basebackup/pg_createsubscriber.c
=== using patch(1) to apply patch ./v6_REL_17-0001-Fix-duplicate-insert-during-pg_createsubsc.patch ===
patching file src/bin/pg_basebackup/pg_createsubscriber.c
Hunk #1 FAILED at 1206.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_basebackup/pg_createsubscriber.c.rej
Removing src/bin/pg_basebackup/pg_createsubscriber.c.rej
=== using 'git apply' to apply patch ./v6_REL_17-0001-Fix-duplicate-insert-during-pg_createsubsc.patch ===
Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' with conflicts.
U src/bin/pg_basebackup/pg_createsubscriber.c
diff --cc src/bin/pg_basebackup/pg_createsubscriber.c
index 9a656c49c69,d3a747a01f3..00000000000
--- a/src/bin/pg_basebackup/pg_createsubscriber.c
+++ b/src/bin/pg_basebackup/pg_createsubscriber.c
@@@ -1247,21 -1203,21 +1247,37 @@@ setup_recovery(const struct LogicalRepI
  	 * targets (name, time, xid, LSN).
  	 */
  	recoveryconfcontents = GenerateRecoveryConfig(conn, NULL, NULL);
++<<<<<<< ours
 +	appendPQExpBufferStr(recoveryconfcontents, "recovery_target = ''\n");
 +	appendPQExpBufferStr(recoveryconfcontents,
 +						 "recovery_target_timeline = 'latest'\n");
++=======
+ 	appendPQExpBuffer(recoveryconfcontents, "recovery_target = ''\n");
+ 	appendPQExpBuffer(recoveryconfcontents,
+ 					  "recovery_target_timeline = 'latest'\n");
++>>>>>>> theirs
  
  	/*
  	 * Set recovery_target_inclusive = false to avoid reapplying the
  	 * transaction committed at consistent_lsn after subscription is enabled.
  	 */
++<<<<<<< ours
 +	appendPQExpBufferStr(recoveryconfcontents,
 +						 "recovery_target_inclusive = false\n");
 +	appendPQExpBufferStr(recoveryconfcontents,
 +						 "recovery_target_action = promote\n");
 +	appendPQExpBufferStr(recoveryconfcontents, "recovery_target_name = ''\n");
 +	appendPQExpBufferStr(recoveryconfcontents, "recovery_target_time = ''\n");
 +	appendPQExpBufferStr(recoveryconfcontents, "recovery_target_xid = ''\n");
++=======
+ 	appendPQExpBuffer(recoveryconfcontents,
+ 					  "recovery_target_inclusive = false\n");
+ 	appendPQExpBuffer(recoveryconfcontents,
+ 					  "recovery_target_action = promote\n");
+ 	appendPQExpBuffer(recoveryconfcontents, "recovery_target_name = ''\n");
+ 	appendPQExpBuffer(recoveryconfcontents, "recovery_target_time = ''\n");
+ 	appendPQExpBuffer(recoveryconfcontents, "recovery_target_xid = ''\n");
++>>>>>>> theirs
  
  	if (dry_run)
  	{