=== Applying patches on top of PostgreSQL commit ID 15df9d7b5123b2b478886175c17cd0c0359d9996 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Feb 26 22:38:23 UTC 2025
On branch cf/5433
nothing to commit, working tree clean
=== applying patch ./v16-0001-Add-support-for-two-phase-commit-in-pg_createsub.patch
Applied patch to 'doc/src/sgml/ref/pg_createsubscriber.sgml' cleanly.
Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' with conflicts.
Applied patch to 'src/bin/pg_basebackup/t/040_pg_createsubscriber.pl' cleanly.
U src/bin/pg_basebackup/pg_createsubscriber.c
diff --cc src/bin/pg_basebackup/pg_createsubscriber.c
index a5a2d61165,7445852764..0000000000
--- a/src/bin/pg_basebackup/pg_createsubscriber.c
+++ b/src/bin/pg_basebackup/pg_createsubscriber.c
@@@ -60,10 -59,6 +60,13 @@@ struct LogicalRepInf
  	bool		made_publication;	/* publication was created */
  };
  
++<<<<<<< ours
 +/*
 + * Information shared across all the databases (or publications and
 + * subscriptions).
 + */
++=======
++>>>>>>> theirs
  struct LogicalRepInfos
  {
  	struct LogicalRepInfo *dbinfo;
@@@ -954,7 -949,7 +957,11 @@@ check_publisher(const struct LogicalRep
  		failed = true;
  	}
  
++<<<<<<< ours
 +	if (max_prepared_transactions != 0 && !dbinfos.two_phase)
++=======
+ 	if (max_prepared_transactions != 0 && dbinfos.two_phase)
++>>>>>>> theirs
  	{
  		pg_log_warning("two_phase option will not be enabled for replication slots");
  		pg_log_warning_detail("Subscriptions will be created with the two_phase option disabled.  "