=== Applying patches on top of PostgreSQL commit ID 5941946d0934b9eccb0d5bfebd40b155249a0130 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 19 19:47:18 UTC 2025
On branch cf/5505
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-Allow-planner-support-function-to-return-index-co.patch ===
Applying: Allow planner support function to return index conditions in OR clause
Using index info to reconstruct a base tree...
M	src/backend/optimizer/path/indxpath.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/optimizer/path/indxpath.c
CONFLICT (content): Merge conflict in src/backend/optimizer/path/indxpath.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 Allow planner support function to return index conditions in OR clause
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/indxpath.c
=== using patch(1) to apply patch ./v2-0001-Allow-planner-support-function-to-return-index-co.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 ./v2-0001-Allow-planner-support-function-to-return-index-co.patch ===
Applied patch to 'src/backend/optimizer/path/indxpath.c' with conflicts.
U src/backend/optimizer/path/indxpath.c
diff --cc src/backend/optimizer/path/indxpath.c
index a43ca16d683,628cf7d7530..00000000000
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@@ -2439,15 -2453,11 +2460,21 @@@ match_join_clauses_to_index(PlannerInf
  		if (!join_clause_is_movable_to(rinfo, rel))
  			continue;
  
 -		/* Potentially usable, so see if it matches the index or is an OR */
 +		/*
 +		 * Potentially usable, so see if it matches the index or is an OR. Use
 +		 * list_append_unique_ptr() here to avoid possible duplicates when
 +		 * processing the same clauses with different indexes.
 +		 */
  		if (restriction_is_or_clause(rinfo))
++<<<<<<< ours
 +			*joinorclauses = list_append_unique_ptr(*joinorclauses, rinfo);
 +
 +		match_clause_to_index(root, rinfo, index, clauseset);
++=======
+ 			*joinorclauses = lappend(*joinorclauses, rinfo);
+ 		else
+ 			match_clause_to_index(root, rinfo, index, clauseset, NULL);
++>>>>>>> theirs
  	}
  }