=== Applying patches on top of PostgreSQL commit ID a39e53a700c5b728f2f7dab964e33b157979fb3a ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Oct 15 18:22:29 UTC 2026
On branch cf/7463
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Fix-logical-replication-with-multirange-WITHOUT-O.patch ===
Applying: Fix logical replication with multirange WITHOUT OVERLAPS identity keys
=== using 'git am' to apply patch ./v5_PG18-0001-Fix-logical-replication-with-multirange-WITH.patch ===
Applying: Fix logical replication with multirange WITHOUT OVERLAPS identity keys
Using index info to reconstruct a base tree...
M	src/backend/executor/execReplication.c
M	src/test/subscription/t/034_temporal.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/subscription/t/034_temporal.pl
Auto-merging src/backend/executor/execReplication.c
CONFLICT (content): Merge conflict in src/backend/executor/execReplication.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 logical replication with multirange WITHOUT OVERLAPS identity keys
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".
=== using patch(1) to apply patch ./v5_PG18-0001-Fix-logical-replication-with-multirange-WITH.patch ===
patching file src/backend/executor/execReplication.c
Hunk #1 FAILED at 37.
Hunk #2 FAILED at 176.
Hunk #3 FAILED at 216.
Hunk #4 succeeded at 254 with fuzz 2 (offset 28 lines).
Hunk #5 succeeded at 415 (offset 50 lines).
3 out of 5 hunks FAILED -- saving rejects to file src/backend/executor/execReplication.c.rej
patching file src/test/subscription/t/034_temporal.pl
Hunk #1 succeeded at 699 with fuzz 2 (offset 71 lines).
Unstaged changes after reset:
M	src/backend/executor/execReplication.c
M	src/test/subscription/t/034_temporal.pl
Removing src/backend/executor/execReplication.c.rej
=== using 'git apply' to apply patch ./v5_PG18-0001-Fix-logical-replication-with-multirange-WITH.patch ===
Applied patch to 'src/backend/executor/execReplication.c' with conflicts.
Applied patch to 'src/test/subscription/t/034_temporal.pl' cleanly.
U src/backend/executor/execReplication.c
diff --cc src/backend/executor/execReplication.c
index 94d7f0e69ad,08ac54a3aed..00000000000
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@@ -39,7 -36,7 +39,11 @@@
  
  
  static bool tuples_equal(TupleTableSlot *slot1, TupleTableSlot *slot2,
++<<<<<<< ours
 +						 TypeCacheEntry **eq, Bitmapset *columns);
++=======
+ 						 TypeCacheEntry **eq);
++>>>>>>> theirs
  static bool repl_index_key_equal(Relation idxrel, TupleTableSlot *slot1,
  								 TupleTableSlot *slot2, ScanKey skey);