[PATCH] clarify palloc comment on quote_literal_cstr
1 patchset tracked - current t51375_4
v4t51375_4posted Apr 07, 2025successwon't retryancient 2ypg 18
base50e6eb731 Jan 01, 2025 - 626 days / 5278 commits behind master (from history)
applyapplied Aug 18, 14:33
rebaselast tried Aug 18, 14:33 on 195e8e427
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 Patch failed at 0001 clarify palloc comment on quote_literal_cstr error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/backend/utils/adt/quote.c
pushAug 18, 14:33 -> 74f207278branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 18 | 858 / 858 | 0m 36s / 3m 46s | docker run ... :t51375 | Aug 18, 14:44 |
run 32149094204executed 858 - ccache 1569 hit / 4935 miss - head 74f207278 - digest sha256:fbe015485e58ce... - run 32149094204 | ||||||