=== Applying patches on top of PostgreSQL commit ID 3d10ece612f535be15a9cb7ca31620c80db6f0e9 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Mar 24 03:37:25 UTC 2026
On branch cf/4529
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v23-0001-Temp-context-for-maybe_reread_subscription.patch ===
Applying: Temp context for maybe_reread_subscription().
=== using 'git am' to apply patch ./v23-0002-Refactor-to-remove-ForeignServerName.patch ===
Applying: Refactor to remove ForeignServerName().
=== using 'git am' to apply patch ./v23-0003-Add-pg_dump-tests-related-to-CREATE-SUBSCRIPTION.patch ===
Applying: Add pg_dump tests related to CREATE SUBSCRIPTION ... SERVER.
=== using 'git am' to apply patch ./v23-0004-Add-dependency-entry-for-FDW-connection-function.patch ===
Applying: Add dependency entry for FDW connection function.
Using index info to reconstruct a base tree...
M	src/backend/commands/foreigncmds.c
M	src/include/catalog/catversion.h
M	src/test/regress/expected/subscription.out
M	src/test/regress/sql/subscription.sql
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
Auto-merging src/backend/commands/foreigncmds.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 Add dependency entry for FDW connection function.
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/include/catalog/catversion.h
=== using patch(1) to apply patch ./v23-0004-Add-dependency-entry-for-FDW-connection-function.patch ===
patching file src/backend/commands/foreigncmds.c
Hunk #1 succeeded at 715 (offset 8 lines).
Hunk #2 FAILED at 822.
Hunk #3 FAILED at 862.
Hunk #4 succeeded at 935 (offset 43 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/backend/commands/foreigncmds.c.rej
patching file src/include/catalog/catversion.h
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/catversion.h.rej
patching file src/test/regress/expected/subscription.out
Hunk #1 FAILED at 185.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/subscription.out.rej
patching file src/test/regress/sql/subscription.sql
Hunk #1 FAILED at 138.
1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/sql/subscription.sql.rej
Unstaged changes after reset:
M	src/backend/commands/foreigncmds.c
Removing src/backend/commands/foreigncmds.c.rej
Removing src/include/catalog/catversion.h.rej
Removing src/test/regress/expected/subscription.out.rej
Removing src/test/regress/sql/subscription.sql.rej
=== using 'git apply' to apply patch ./v23-0004-Add-dependency-entry-for-FDW-connection-function.patch ===
Applied patch to 'src/backend/commands/foreigncmds.c' cleanly.
Applied patch to 'src/include/catalog/catversion.h' with conflicts.
Applied patch to 'src/test/regress/expected/subscription.out' cleanly.
Applied patch to 'src/test/regress/sql/subscription.sql' cleanly.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index 420850293f8,a4f0d02af9c..00000000000
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@@ -57,6 -57,6 +57,10 @@@
   */
  
  /*							yyyymmddN */
++<<<<<<< ours
 +#define CATALOG_VERSION_NO	202603201
++=======
+ #define CATALOG_VERSION_NO	202603181
++>>>>>>> theirs
  
  #endif