=== Applying patches on top of PostgreSQL commit ID e5aeed4b8020424fa882c3d1969d00c2b2d8cf30 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 20 07:16:22 UTC 2025
On branch cf/5585
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v15-0001-Filter-transactions-that-need-not-be-published.patch ===
Applying: Filter transactions that need not be published.
Using index info to reconstruct a base tree...
M	src/backend/replication/logical/decode.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/include/replication/reorderbuffer.h
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/include/replication/reorderbuffer.h
Auto-merging src/backend/replication/logical/reorderbuffer.c
Auto-merging src/backend/replication/logical/decode.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/decode.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 Filter transactions that need not be published.
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/replication/logical/decode.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/include/replication/reorderbuffer.h
M	src/tools/pgindent/typedefs.list
=== using patch(1) to apply patch ./v15-0001-Filter-transactions-that-need-not-be-published.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v15-0001-Filter-transactions-that-need-not-be-published.patch ===
Applied patch to 'src/backend/replication/logical/decode.c' with conflicts.
Applied patch to 'src/backend/replication/logical/reorderbuffer.c' cleanly.
Applied patch to 'src/include/replication/reorderbuffer.h' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/replication/logical/decode.c
diff --cc src/backend/replication/logical/decode.c
index 78f9a0a11c4,d8e0114a0b4..00000000000
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@@ -915,7 -915,12 +915,16 @@@ DecodeInsert(LogicalDecodingContext *ct
  	if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
  		return;
  
++<<<<<<< ours
 +	change = ReorderBufferAllocChange(ctx->reorder);
++=======
+ 	if (ctx->reorder->can_filter_change &&
+ 		ReorderBufferFilterByRelFileLocator(ctx->reorder, XLogRecGetXid(r),
+ 											buf->origptr, &target_locator))
+ 		return;
+ 
+ 	change = ReorderBufferGetChange(ctx->reorder);
++>>>>>>> theirs
  	if (!(xlrec->flags & XLH_INSERT_IS_SPECULATIVE))
  		change->action = REORDER_BUFFER_CHANGE_INSERT;
  	else