=== Applying patches on top of PostgreSQL commit ID 72c2f36d572763201430a35414138c1b9ec3a106 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 27 07:41:19 UTC 2025
On branch cf/5361
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Teach-Append-to-consider-tuple_fraction-when-accu.patch ===
Applying: Teach Append to consider tuple_fraction when accumulating subpaths.
Using index info to reconstruct a base tree...
M	src/backend/optimizer/path/allpaths.c
M	src/backend/optimizer/plan/planner.c
M	src/test/regress/expected/partition_join.out
M	src/test/regress/expected/union.out
M	src/test/regress/sql/partition_join.sql
Falling back to patching base and 3-way merge...
Auto-merging src/backend/optimizer/plan/planner.c
Auto-merging src/backend/optimizer/path/allpaths.c
CONFLICT (content): Merge conflict in src/backend/optimizer/path/allpaths.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 Teach Append to consider tuple_fraction when accumulating subpaths.
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/optimizer/path/allpaths.c
=== using patch(1) to apply patch ./v3-0001-Teach-Append-to-consider-tuple_fraction-when-accu.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 ./v3-0001-Teach-Append-to-consider-tuple_fraction-when-accu.patch ===
Applied patch to 'src/backend/optimizer/path/allpaths.c' with conflicts.
Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly.
Applied patch to 'src/test/regress/expected/partition_join.out' cleanly.
Applied patch to 'src/test/regress/expected/union.out' cleanly.
Applied patch to 'src/test/regress/sql/partition_join.sql' cleanly.
U src/backend/optimizer/path/allpaths.c
diff --cc src/backend/optimizer/path/allpaths.c
index df3453f99f0,9e7f01a9684..00000000000
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@@ -1381,7 -1381,7 +1381,11 @@@ add_paths_to_append_rel(PlannerInfo *ro
  			if (root->tuple_fraction > 0.0)
  				cheapest_path =
  					get_cheapest_fractional_path(childrel,
++<<<<<<< ours
 +												 root->tuple_fraction);
++=======
+ 													 root->tuple_fraction);
++>>>>>>> theirs
  			else
  				cheapest_path = childrel->cheapest_startup_path;