=== Applying patches on top of PostgreSQL commit ID 5ffb8c7409385c58e5c1abaa22ee77ba4c1b5c33 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Oct 22 13:02:33 UTC 2026
On branch cf/7500
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-deparsing-of-unary-operators-applied-to-const.patch ===
Applying: Fix deparsing of unary operators applied to constants.
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/ruleutils.c
M	src/test/regress/expected/create_view.out
M	src/test/regress/sql/create_view.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/create_view.sql
Auto-merging src/test/regress/expected/create_view.out
CONFLICT (content): Merge conflict in src/test/regress/expected/create_view.out
Auto-merging src/backend/utils/adt/ruleutils.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 Fix deparsing of unary operators applied to constants.
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-Fix-deparsing-of-unary-operators-applied-to-const.patch ===
patching file src/backend/utils/adt/ruleutils.c
Hunk #1 succeeded at 10851 (offset 40 lines).
patching file src/test/regress/expected/create_view.out
Hunk #1 succeeded at 2308 (offset 23 lines).
Hunk #2 FAILED at 2354.
Hunk #3 succeeded at 2460 with fuzz 1 (offset 25 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/test/regress/expected/create_view.out.rej
patching file src/test/regress/sql/create_view.sql
Hunk #1 succeeded at 851 (offset 13 lines).
Unstaged changes after reset:
M	src/backend/utils/adt/ruleutils.c
M	src/test/regress/expected/create_view.out
M	src/test/regress/sql/create_view.sql
Removing src/test/regress/expected/create_view.out.rej
=== using 'git apply' to apply patch ./v1-0001-Fix-deparsing-of-unary-operators-applied-to-const.patch ===
Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly.
Applied patch to 'src/test/regress/expected/create_view.out' with conflicts.
Applied patch to 'src/test/regress/sql/create_view.sql' cleanly.
U src/test/regress/expected/create_view.out
diff --cc src/test/regress/expected/create_view.out
index 85ffca793f2,83bd0226a4e..00000000000
--- a/src/test/regress/expected/create_view.out
+++ b/src/test/regress/expected/create_view.out
@@@ -2339,7 -2354,7 +2377,11 @@@ drop cascades to view aliased_view_
  drop cascades to view aliased_view_3
  drop cascades to view aliased_view_4
  DROP SCHEMA testviewschm2 CASCADE;
++<<<<<<< ours
 +NOTICE:  drop cascades to 82 other objects
++=======
+ NOTICE:  drop cascades to 84 other objects
++>>>>>>> theirs
  DETAIL:  drop cascades to table t1
  drop cascades to view temporal1
  drop cascades to view temporal2
@@@ -2418,7 -2433,9 +2460,11 @@@ drop cascades to view tt23
  drop cascades to view tt24v
  drop cascades to view tt25v
  drop cascades to view tt26v
 +drop cascades to operator ||(xml,xml)
 +drop cascades to view tt261v
  drop cascades to table tt27v_tbl
  drop cascades to view tt27v
+ drop cascades to view tt28v
+ drop cascades to view tt29v
+ drop cascades to view tt28v_copy
+ drop cascades to view tt29v_copy