=== Applying patches on top of PostgreSQL commit ID 302cf15759233e654512979286ce1a5c3b36625f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Feb 19 07:03:26 UTC 2025
On branch cf/4770
nothing to commit, working tree clean
=== applying patch ./v79-0001-Introduce-inactive_timeout-based-replication-slo.patch
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/logical-replication.sgml' cleanly.
Applied patch to 'doc/src/sgml/system-views.sgml' cleanly.
Applied patch to 'src/backend/access/transam/xlog.c' cleanly.
Applied patch to 'src/backend/replication/slot.c' with conflicts.
Applied patch to 'src/backend/replication/slotfuncs.c' cleanly.
Applied patch to 'src/backend/utils/adt/timestamp.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/server.c' cleanly.
Applied patch to 'src/include/replication/slot.h' cleanly.
Applied patch to 'src/include/utils/guc_hooks.h' cleanly.
Applied patch to 'src/include/utils/timestamp.h' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/replication/slot.c
diff --cc src/backend/replication/slot.c
index d73c9c2fc3,674998b4e9..0000000000
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@@ -1761,10 -1761,11 +1761,18 @@@ InvalidatePossiblyObsoleteSlot(uint32 p
  			 * terminated (if any), so record them here to ensure that we
  			 * would report the correct invalidation cause.
  			 *
++<<<<<<< ours
 +			 * Unlike other slot attributes, slot's inactive_since can't be
 +			 * changed until the acquired slot is released or the owning
 +			 * process is terminated. So, the inactive slot can only be
 +			 * invalidated immediately without being terminated.
++=======
+ 			 * Unlike others, slot's inactive_since can't be changed once it
+ 			 * is acquired till it gets released or the process owning it gets
+ 			 * terminated. The slot remains active till some process owns it.
+ 			 * So, the inactive slot can only be invalidated immediately
+ 			 * without being terminated.
++>>>>>>> theirs
  			 */
  			if (!terminated)
  			{