=== Applying patches on top of PostgreSQL commit ID e2809e3a1015697832ee4d37b75ba1cd0caac0f0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 31 07:20:29 UTC 2025
On branch cf/5660
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v50-0001-Add-without_portion-GiST-support-proc.patch ===
Applying: Add without_portion GiST support proc
=== using 'git am' to apply patch ./v50-0002-Add-UPDATE-DELETE-FOR-PORTION-OF.patch ===
Applying: Add UPDATE/DELETE FOR PORTION OF
=== using 'git am' to apply patch ./v50-0003-Add-CASCADE-SET-NULL-SET-DEFAULT-for-temporal-fo.patch ===
Applying: Add CASCADE/SET NULL/SET DEFAULT for temporal foreign keys
=== using 'git am' to apply patch ./v50-0004-Expose-FOR-PORTION-OF-to-plpgsql-triggers.patch ===
Applying: Expose FOR PORTION OF to plpgsql triggers
=== using 'git am' to apply patch ./v50-0005-Add-PERIODs.patch ===
Applying: Add PERIODs
error: sha1 information is lacking or useless (doc/src/sgml/ref/create_table.sgml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add PERIODs
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 ./v50-0005-Add-PERIODs.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v50-0005-Add-PERIODs.patch ===
/work/patches/./v50-0005-Add-PERIODs.patch:589: trailing whitespace.
      referent for its entire duration.  This part must be either a 
Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly.
Applied patch to 'doc/src/sgml/ddl.sgml' cleanly.
Applied patch to 'doc/src/sgml/information_schema.sgml' cleanly.
Applied patch to 'doc/src/sgml/plpgsql.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/alter_table.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/comment.sgml' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'doc/src/sgml/ref/delete.sgml' cleanly.
Applied patch to 'doc/src/sgml/ref/update.sgml' cleanly.
Applied patch to 'doc/src/sgml/trigger.sgml' cleanly.
Applied patch to 'src/backend/catalog/Makefile' cleanly.
Applied patch to 'src/backend/catalog/aclchk.c' cleanly.
Applied patch to 'src/backend/catalog/dependency.c' cleanly.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/information_schema.sql' cleanly.
Applied patch to 'src/backend/catalog/meson.build' cleanly.
Applied patch to 'src/backend/catalog/objectaddress.c' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/catalog/sql_features.txt' cleanly.
Applied patch to 'src/backend/commands/comment.c' cleanly.
Applied patch to 'src/backend/commands/dropcmds.c' cleanly.
Applied patch to 'src/backend/commands/event_trigger.c' cleanly.
Applied patch to 'src/backend/commands/seclabel.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/commands/trigger.c' cleanly.
Applied patch to 'src/backend/commands/view.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly.
Applied patch to 'src/backend/parser/analyze.c' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/parser/parse_relation.c' cleanly.
Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly.
Applied patch to 'src/backend/utils/adt/Makefile' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/utils/cache/lsyscache.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dump.h' with conflicts.
Applied patch to 'src/bin/pg_dump/pg_dump_sort.c' cleanly.
Applied patch to 'src/bin/psql/describe.c' cleanly.
Applied patch to 'src/include/catalog/Makefile' cleanly.
Applied patch to 'src/include/catalog/heap.h' cleanly.
Applied patch to 'src/include/catalog/meson.build' cleanly.
Applied patch to 'src/include/catalog/pg_index.h' cleanly.
Falling back to direct application...
Applied patch to 'src/include/catalog/pg_range.h' cleanly.
Applied patch to 'src/include/commands/tablecmds.h' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/include/nodes/primnodes.h' cleanly.
Applied patch to 'src/include/parser/kwlist.h' cleanly.
Applied patch to 'src/include/parser/parse_utilcmd.h' cleanly.
Applied patch to 'src/include/utils/lsyscache.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/modules/test_ddl_deparse/test_ddl_deparse.c' cleanly.
Applied patch to 'src/test/regress/expected/for_portion_of.out' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/privileges.out' cleanly.
Applied patch to 'src/test/regress/expected/without_overlaps.out' cleanly.
Applied patch to 'src/test/regress/parallel_schedule' cleanly.
Applied patch to 'src/test/regress/sql/for_portion_of.sql' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/sql/privileges.sql' cleanly.
Applied patch to 'src/test/regress/sql/without_overlaps.sql' cleanly.
U src/bin/pg_dump/pg_dump.h
warning: 1 line adds whitespace errors.
diff --cc src/bin/pg_dump/pg_dump.h
index e6f0f86a459,579cd161d4d..00000000000
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@@ -369,7 -373,7 +373,11 @@@ typedef struct _tableInf
  	bool	   *notnull_islocal;	/* true if NOT NULL has local definition */
  	struct _attrDefInfo **attrdefs; /* DEFAULT expressions */
  	struct _constraintInfo *checkexprs; /* CHECK constraints */
++<<<<<<< ours
 +	struct _relStatsInfo *stats;	/* only set for matviews */
++=======
+ 	struct _periodInfo *periods;	/* PERIOD definitions */
++>>>>>>> theirs
  	bool		needs_override; /* has GENERATED ALWAYS AS IDENTITY */
  	char	   *amname;			/* relation access method */