=== Applying patches on top of PostgreSQL commit ID 46b4ba533cee9f64a60714d91607e74362abf67f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Apr  8 01:43:22 UTC 2025
On branch cf/5684
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-clarify-palloc-comment-on-quote_literal_cstr.patch ===
Applying: clarify palloc comment on quote_literal_cstr
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/quote.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/quote.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/quote.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 clarify palloc comment on quote_literal_cstr
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/quote.c
=== using patch(1) to apply patch ./0001-clarify-palloc-comment-on-quote_literal_cstr.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 ./0001-clarify-palloc-comment-on-quote_literal_cstr.patch ===
Applied patch to 'src/backend/utils/adt/quote.c' with conflicts.
U src/backend/utils/adt/quote.c
diff --cc src/backend/utils/adt/quote.c
index 551de59a07f,60bda20606d..00000000000
--- a/src/backend/utils/adt/quote.c
+++ b/src/backend/utils/adt/quote.c
@@@ -107,13 -107,11 +107,21 @@@ quote_literal_cstr(const char *rawstr
  	int			newlen;
  
  	len = strlen(rawstr);
++<<<<<<< ours
 +	/* We make a worst-case result area; wasting a little space is OK */
 +	result = palloc(
 +					(len * 2)	/* doubling for every character if each one is
 +								 * a quote */
 +					+ 3			/* two outer quotes + possibly 'E' if needed */
 +					+ 1			/* null terminator */
 +		);
++=======
+ 	/* Allocate memory for worst case result factoring in a. double the
+ 	length number of bytes, in case every character is a quote, b. two
+ 	bytes for two outer quotes c. extra byte for E' d. one byte for null
+ 	terminator. */
+ 	result = palloc(len * 2 + 3 + 1);
++>>>>>>> theirs
  
  	newlen = quote_literal_internal(result, rawstr, len);
  	result[newlen] = '\0';