=== Applying patches on top of PostgreSQL commit ID 07b7a964d368e0618e1e1c788f3b998b4e571427 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Mar 20 17:22:22 UTC 2026
On branch cf/6579
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-Fix-wrong-result-of-refresh-matview-concurrently.patch ===
Applying: Fix wrong result of refresh matview concurrently.
Using index info to reconstruct a base tree...
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_proc.dat
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
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 wrong result of refresh matview concurrently.
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/commands/matview.c
M	src/backend/utils/adt/rowtypes.c
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_proc.dat
M	src/test/regress/expected/matview.out
M	src/test/regress/sql/matview.sql
=== using patch(1) to apply patch ./v4-0001-Fix-wrong-result-of-refresh-matview-concurrently.patch ===
patching file src/backend/commands/matview.c
patching file src/backend/utils/adt/rowtypes.c
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/include/catalog/pg_proc.dat
Hunk #1 succeeded at 10866 (offset 10 lines).
patching file src/test/regress/expected/matview.out
patching file src/test/regress/sql/matview.sql
Unstaged changes after reset:
M	src/backend/commands/matview.c
M	src/backend/utils/adt/rowtypes.c
M	src/include/catalog/pg_proc.dat
M	src/test/regress/expected/matview.out
M	src/test/regress/sql/matview.sql
Removing src/include/catalog/catversion.h.rej
=== using 'git apply' to apply patch ./v4-0001-Fix-wrong-result-of-refresh-matview-concurrently.patch ===
Applied patch to 'src/backend/commands/matview.c' cleanly.
Applied patch to 'src/backend/utils/adt/rowtypes.c' cleanly.
Applied patch to 'src/include/catalog/catversion.h' with conflicts.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/test/regress/expected/matview.out' cleanly.
Applied patch to 'src/test/regress/sql/matview.sql' cleanly.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index fd8472cb5a5,3da6a75ff87..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	202603191
++=======
+ #define CATALOG_VERSION_NO	202603131
++>>>>>>> theirs
  
  #endif