=== Applying patches on top of PostgreSQL commit ID 01d6832c109bcc37acb30e934b7c472334b7c291 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Aug 11 20:26:25 UTC 2025 On branch cf/5836 nothing to commit, working tree clean === using 'git am' to apply patch ./v52-0001-Add-docs-chapter-for-temporal-tables.patch === Applying: Add docs chapter for temporal tables === using 'git am' to apply patch ./v52-0002-Document-temporal-foreign-keys.patch === Applying: Document temporal foreign keys === using 'git am' to apply patch ./v52-0003-Document-temporal-PERIODs.patch === Applying: Document temporal PERIODs === using 'git am' to apply patch ./v52-0004-Document-temporal-update-delete.patch === Applying: Document temporal update/delete === using 'git am' to apply patch ./v52-0005-Add-range_minus_multi-and-multirange_minus_multi.patch === Applying: Add range_minus_multi and multirange_minus_multi functions Using index info to reconstruct a base tree... A doc/src/sgml/func.sgml M src/backend/utils/adt/multirangetypes.c M src/backend/utils/adt/rangetypes.c M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/rangetypes.c Auto-merging src/backend/utils/adt/multirangetypes.c CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in Add range_minus_multi and multirange_minus_multi functions. Version Add range_minus_multi and multirange_minus_multi functions of doc/src/sgml/func.sgml left in tree. 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 range_minus_multi and multirange_minus_multi functions 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/utils/adt/multirangetypes.c M src/backend/utils/adt/rangetypes.c M src/include/catalog/pg_proc.dat M src/include/utils/rangetypes.h M src/test/regress/expected/multirangetypes.out M src/test/regress/expected/rangetypes.out M src/test/regress/sql/multirangetypes.sql M src/test/regress/sql/rangetypes.sql Removing doc/src/sgml/func.sgml === using patch(1) to apply patch ./v52-0005-Add-range_minus_multi-and-multirange_minus_multi.patch === can't find file to patch at input line 44 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 26cbb188f9a7816d28390c5a7d32940f57176218 Mon Sep 17 00:00:00 2001 |From: "Paul A. Jungwirth" |Date: Sat, 30 Dec 2023 23:10:59 -0800 |Subject: [PATCH v52 05/10] Add range_minus_multi and multirange_minus_multi | functions | |The existing range_minus function raises an exception when the range is |"split", because then the result can't be represented by a single range. |For example '[0,10)'::int4range - '[4,5)' would be '[0,4)' and '[5,10)'. | |This commit adds new set-returning functions so that callers can get |results even in the case of splits. There is no risk of an exception for |multiranges, but a set-returning function lets us handle them the same |way we handle ranges. | |Both functions return zero results if the subtraction would give an |empty range/multirange. | |The main use-case for these functions is to implement UPDATE/DELETE FOR |PORTION OF, which must compute the application-time of "temporal |leftovers": the part of history in an updated/deleted row that was not |changed. To preserve the untouched history, we will implicitly insert |one record for each result returned by range/multirange_minus_multi. |Using a set-returning function will also let us support user-defined |types for application-time update/delete in the future. | |Author: Paul A. Jungwirth |--- | doc/src/sgml/func.sgml | 42 +++++ | src/backend/utils/adt/multirangetypes.c | 71 ++++++++ | src/backend/utils/adt/rangetypes.c | 166 ++++++++++++++++++ | src/include/catalog/pg_proc.dat | 8 + | src/include/utils/rangetypes.h | 2 + | src/test/regress/expected/multirangetypes.out | 116 ++++++++++++ | src/test/regress/expected/rangetypes.out | 54 ++++++ | src/test/regress/sql/multirangetypes.sql | 22 +++ | src/test/regress/sql/rangetypes.sql | 10 ++ | 9 files changed, 491 insertions(+) | |diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml |index a6d79765c1a..1354acb4b24 100644 |--- a/doc/src/sgml/func.sgml |+++ b/doc/src/sgml/func.sgml -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored patching file src/backend/utils/adt/multirangetypes.c Hunk #1 succeeded at 1226 (offset 1 line). patching file src/backend/utils/adt/rangetypes.c Hunk #3 succeeded at 1215 (offset -2 lines). patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 10919 (offset 28 lines). Hunk #2 succeeded at 11213 (offset 28 lines). patching file src/include/utils/rangetypes.h patching file src/test/regress/expected/multirangetypes.out patching file src/test/regress/expected/rangetypes.out patching file src/test/regress/sql/multirangetypes.sql patching file src/test/regress/sql/rangetypes.sql Unstaged changes after reset: M src/backend/utils/adt/multirangetypes.c M src/backend/utils/adt/rangetypes.c M src/include/catalog/pg_proc.dat M src/include/utils/rangetypes.h M src/test/regress/expected/multirangetypes.out M src/test/regress/expected/rangetypes.out M src/test/regress/sql/multirangetypes.sql M src/test/regress/sql/rangetypes.sql === using 'git apply' to apply patch ./v52-0005-Add-range_minus_multi-and-multirange_minus_multi.patch === error: doc/src/sgml/func.sgml: does not exist in index Applied patch to 'src/backend/utils/adt/multirangetypes.c' cleanly. Applied patch to 'src/backend/utils/adt/rangetypes.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/utils/rangetypes.h' cleanly. Applied patch to 'src/test/regress/expected/multirangetypes.out' cleanly. Applied patch to 'src/test/regress/expected/rangetypes.out' cleanly. Applied patch to 'src/test/regress/sql/multirangetypes.sql' cleanly. Applied patch to 'src/test/regress/sql/rangetypes.sql' cleanly.