=== Applying patches on top of PostgreSQL commit ID 1378aa13430e264a990a18597e9d8fdae740927e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Oct  1 23:41:29 UTC 2026
On branch cf/7378
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-GROUP-BY-ALL-redo-inherits-ORDER-BY-equality-semanti.patch ===
Applying: GROUP BY ALL redo (inherits ORDER BY equality semantics)
Using index info to reconstruct a base tree...
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
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 GROUP BY ALL redo (inherits ORDER BY equality semantics)
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 ./0001-GROUP-BY-ALL-redo-inherits-ORDER-BY-equality-semanti.patch ===
patching file doc/src/sgml/queries.sgml
patching file doc/src/sgml/ref/select.sgml
patching file doc/src/sgml/ref/select_into.sgml
patching file src/backend/parser/analyze.c
patching file src/backend/parser/gram.y
patching file src/backend/parser/parse_clause.c
patching file src/backend/utils/adt/ruleutils.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/nodes/parsenodes.h
patching file src/include/parser/parse_clause.h
patching file src/test/regress/expected/aggregates.out
patching file src/test/regress/sql/aggregates.sql
Unstaged changes after reset:
M	doc/src/sgml/queries.sgml
M	doc/src/sgml/ref/select.sgml
M	doc/src/sgml/ref/select_into.sgml
M	src/backend/parser/analyze.c
M	src/backend/parser/gram.y
M	src/backend/parser/parse_clause.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/nodes/parsenodes.h
M	src/include/parser/parse_clause.h
M	src/test/regress/expected/aggregates.out
M	src/test/regress/sql/aggregates.sql
Removing src/include/catalog/catversion.h.rej
=== using 'git apply' to apply patch ./0001-GROUP-BY-ALL-redo-inherits-ORDER-BY-equality-semanti.patch ===
Applied patch to 'doc/src/sgml/queries.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/select.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/select_into.sgml' cleanly.
Applied patch to 'src/backend/parser/analyze.c' cleanly.
Applied patch to 'src/backend/parser/gram.y' cleanly.
Applied patch to 'src/backend/parser/parse_clause.c' cleanly.
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/include/catalog/catversion.h' with conflicts.
Applied patch to 'src/include/nodes/parsenodes.h' cleanly.
Applied patch to 'src/include/parser/parse_clause.h' cleanly.
Applied patch to 'src/test/regress/expected/aggregates.out' cleanly.
Applied patch to 'src/test/regress/sql/aggregates.sql' cleanly.
U src/include/catalog/catversion.h
diff --cc src/include/catalog/catversion.h
index 7f7667f6179,72085f8460d..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	202610021
++=======
+ #define CATALOG_VERSION_NO	202610011
++>>>>>>> theirs
  
  #endif