=== Applying patches on top of PostgreSQL commit ID e0dc4bbfb88546cbbe53cfc7f8e9aca8e256adff ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Oct 27 07:22:32 UTC 2025
On branch cf/4337
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v34-0001-Add-a-syntax-to-create-Incrementally-Maintainabl.patch ===
Applying: Add a syntax to create Incrementally Maintainable Materialized Views
Using index info to reconstruct a base tree...
M	src/backend/parser/gram.y
M	src/include/nodes/primnodes.h
M	src/include/parser/kwlist.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/parser/kwlist.h
Auto-merging src/include/nodes/primnodes.h
Auto-merging src/backend/parser/gram.y
CONFLICT (content): Merge conflict in src/backend/parser/gram.y
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 a syntax to create Incrementally Maintainable Materialized Views
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/parser/gram.y
M	src/include/nodes/primnodes.h
M	src/include/parser/kwlist.h
=== using patch(1) to apply patch ./v34-0001-Add-a-syntax-to-create-Incrementally-Maintainabl.patch ===
patching file src/backend/parser/gram.y
Hunk #2 FAILED at 739.
Hunk #3 succeeded at 4910 (offset 106 lines).
Hunk #4 succeeded at 4954 (offset 106 lines).
Hunk #5 succeeded at 17929 (offset 235 lines).
Hunk #6 succeeded at 18520 (offset 237 lines).
1 out of 6 hunks FAILED -- saving rejects to file src/backend/parser/gram.y.rej
patching file src/include/nodes/primnodes.h
Hunk #1 succeeded at 169 with fuzz 2 (offset 1 line).
patching file src/include/parser/kwlist.h
Hunk #1 succeeded at 212 (offset 2 lines).
Unstaged changes after reset:
M	src/backend/parser/gram.y
M	src/include/nodes/primnodes.h
M	src/include/parser/kwlist.h
Removing src/backend/parser/gram.y.rej
=== using 'git apply' to apply patch ./v34-0001-Add-a-syntax-to-create-Incrementally-Maintainabl.patch ===
Applied patch to 'src/backend/parser/gram.y' with conflicts.
Applied patch to 'src/include/nodes/primnodes.h' cleanly.
Applied patch to 'src/include/parser/kwlist.h' cleanly.
U src/backend/parser/gram.y
diff --cc src/backend/parser/gram.y
index a4b29c822e8,943460fd2ce..00000000000
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@@ -736,8 -738,8 +737,13 @@@ static Node *makeRecursiveViewSelect(ch
  
  	HANDLER HAVING HEADER_P HOLD HOUR_P
  
++<<<<<<< ours
 +	IDENTITY_P IF_P IGNORE_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IMPORT_P IN_P INCLUDE
 +	INCLUDING INCREMENT INDENT INDEX INDEXES INHERIT INHERITS INITIALLY INLINE_P
++=======
+ 	IDENTITY_P IF_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IMPORT_P IN_P INCLUDE
+ 	INCLUDING INCREMENT INCREMENTAL INDENT INDEX INDEXES INHERIT INHERITS INITIALLY INLINE_P
++>>>>>>> theirs
  	INNER_P INOUT INPUT_P INSENSITIVE INSERT INSTEAD INT_P INTEGER
  	INTERSECT INTERVAL INTO INVOKER IS ISNULL ISOLATION