=== Applying patches on top of PostgreSQL commit ID 193a4ded94741ba9c24509540a5d586c11761e37 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jun  6 02:13:24 UTC 2026
On branch cf/6820
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-pg_stat_lock-add-blocker-mode-dimension.patch ===
Applying: pg_stat_lock: add blocker mode dimension
Using index info to reconstruct a base tree...
M	src/backend/catalog/system_views.sql
M	src/include/catalog/catversion.h
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/catalog/system_views.sql
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 pg_stat_lock: add blocker mode dimension
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".
=== using patch(1) to apply patch ./v1-0001-pg_stat_lock-add-blocker-mode-dimension.patch ===
patching file src/backend/catalog/system_views.sql
patching file src/backend/storage/lmgr/lock.c
patching file src/backend/storage/lmgr/proc.c
patching file src/backend/utils/activity/pgstat_lock.c
patching file src/backend/utils/adt/pgstatfuncs.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
patching file src/include/pgstat.h
patching file src/include/storage/lock.h
patching file src/test/regress/expected/rules.out
patching file src/test/regress/expected/stats.out
patching file src/test/regress/sql/stats.sql
Unstaged changes after reset:
M	src/backend/catalog/system_views.sql
M	src/backend/storage/lmgr/lock.c
M	src/backend/storage/lmgr/proc.c
M	src/backend/utils/activity/pgstat_lock.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/pgstat.h
M	src/include/storage/lock.h
M	src/test/regress/expected/rules.out
M	src/test/regress/expected/stats.out
M	src/test/regress/sql/stats.sql
Removing src/include/catalog/catversion.h.rej
=== using 'git apply' to apply patch ./v1-0001-pg_stat_lock-add-blocker-mode-dimension.patch ===
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/storage/lmgr/lock.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/proc.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_lock.c' cleanly.
Applied patch to 'src/backend/utils/adt/pgstatfuncs.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/include/pgstat.h' cleanly.
Applied patch to 'src/include/storage/lock.h' cleanly.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/test/regress/expected/stats.out' cleanly.
Applied patch to 'src/test/regress/sql/stats.sql' cleanly.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index 87007e725c1,9716574efec..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	202606051
++=======
+ #define CATALOG_VERSION_NO	202605311
++>>>>>>> theirs
  
  #endif