=== Applying patches on top of PostgreSQL commit ID d4c3a6b8ad830882066122081a7141ecd573f45d ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 19:51:28 UTC 2025
On branch cf/5382
nothing to commit, working tree clean
=== applying patch ./0001-This-commit-adds-support-for-temporary-files-compres.patch
/work/patches/./0001-This-commit-adds-support-for-temporary-files-compres.patch:182: space before tab in indent.
	 	* Read whatever we can get, up to a full bufferload.
/work/patches/./0001-This-commit-adds-support-for-temporary-files-compres.patch:183: space before tab in indent.
	 	*/
Applied patch to 'src/Makefile.global.in' cleanly.
Applied patch to 'src/backend/access/gist/gistbuildbuffers.c' cleanly.
Applied patch to 'src/backend/backup/backup_manifest.c' cleanly.
Applied patch to 'src/backend/executor/nodeHashjoin.c' cleanly.
Applied patch to 'src/backend/storage/file/buffile.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/backend/utils/sort/logtape.c' cleanly.
Applied patch to 'src/backend/utils/sort/tuplestore.c' cleanly.
Applied patch to 'src/include/storage/buffile.h' cleanly.
Applied patch to 'src/test/regress/GNUmakefile' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/jsonb_jsonpath.out' with conflicts.
Falling back to direct application...
U src/test/regress/expected/jsonb_jsonpath.out
warning: 2 lines add whitespace errors.
diff --cc src/test/regress/expected/jsonb_jsonpath.out
index 4bcd4e91a2,b31b32490d..0000000000
--- a/src/test/regress/expected/jsonb_jsonpath.out
+++ b/src/test/regress/expected/jsonb_jsonpath.out
@@@ -2690,10 -2687,9 +2690,14 @@@ set local timezone = 'UTC-10'
  select jsonb_path_query_tz('"12:34:56"', '$.time_tz().string()');
   jsonb_path_query_tz 
  ---------------------
++<<<<<<< ours
 + "12:34:56+10:00"
++=======
+  "12:34:56-08:00"
++>>>>>>> theirs
  (1 row)
  
 +rollback;
  select jsonb_path_query('"12:34:56"', '$.time().string()');
   jsonb_path_query 
  ------------------