=== Applying patches on top of PostgreSQL commit ID 01c729e0c7a5899b841e596147381f5437ab8aab ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar  4 21:21:27 UTC 2026
On branch cf/4314
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Unlink-PHJ-temporary-files-proactively-when-repar.patch ===
Applying: Unlink PHJ temporary files proactively when repartitioning.
Using index info to reconstruct a base tree...
M	src/backend/executor/nodeHash.c
M	src/backend/utils/sort/sharedtuplestore.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/sort/sharedtuplestore.c
Auto-merging src/backend/executor/nodeHash.c
CONFLICT (content): Merge conflict in src/backend/executor/nodeHash.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 Unlink PHJ temporary files proactively when repartitioning.
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/executor/nodeHash.c
M	src/backend/utils/sort/sharedtuplestore.c
M	src/include/utils/sharedtuplestore.h
=== using patch(1) to apply patch ./v2-0001-Unlink-PHJ-temporary-files-proactively-when-repar.patch ===
patching file src/backend/executor/nodeHash.c
Hunk #2 FAILED at 1350.
1 out of 3 hunks FAILED -- saving rejects to file src/backend/executor/nodeHash.c.rej
patching file src/backend/utils/sort/sharedtuplestore.c
Hunk #1 succeeded at 591 (offset 1 line).
patching file src/include/utils/sharedtuplestore.h
Unstaged changes after reset:
M	src/backend/executor/nodeHash.c
M	src/backend/utils/sort/sharedtuplestore.c
M	src/include/utils/sharedtuplestore.h
Removing src/backend/executor/nodeHash.c.rej
=== using 'git apply' to apply patch ./v2-0001-Unlink-PHJ-temporary-files-proactively-when-repar.patch ===
Applied patch to 'src/backend/executor/nodeHash.c' with conflicts.
Applied patch to 'src/backend/utils/sort/sharedtuplestore.c' cleanly.
Applied patch to 'src/include/utils/sharedtuplestore.h' cleanly.
U src/backend/executor/nodeHash.c
diff --cc src/backend/executor/nodeHash.c
index c0eb5a1f0c5,65668c7d9ad..00000000000
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@@ -1349,7 -1350,10 +1350,14 @@@ ExecParallelHashIncreaseNumBatches(Hash
  			/* Wait for the above to be finished. */
  			BarrierArriveAndWait(&pstate->grow_batches_barrier,
  								 WAIT_EVENT_HASH_GROW_BATCHES_REPARTITION);
++<<<<<<< ours
 +			pg_fallthrough;
++=======
+ 			/* It's now safe to free the previous partitions on disk. */
+ 			ExecParallelHashDeleteOldPartitions(hashtable);
+ 
+ 			/* Fall through. */
++>>>>>>> theirs
  
  		case PHJ_GROW_BATCHES_DECIDE: