Bug in jsonb_in function (14 & 15 version are affected)
1 patchset tracked - current t47595_3
v3t47595_3posted Mar 16, 2023successwon't retryancient 4ypg 16
base25a7812cd Mar 13, 2023 - 1286 days / 9732 commits behind master (from history)
applyapplied Aug 18, 15:18
rebaselast tried Aug 18, 15:18 on 195e8e427
Applying: Refactor JSON lexer error reporting Using index info to reconstruct a base tree... M src/common/jsonapi.c Falling back to patching base and 3-way merge... Auto-merging src/common/jsonapi.c CONFLICT (content): Merge conflict in src/common/jsonapi.c Patch failed at 0001 Refactor JSON lexer error reporting 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/common/jsonapi.c
pushAug 18, 15:19 -> a86e696e8branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 681 / 681 | 2m 43s / 4m 00s | docker run ... :t47595 | Aug 18, 15:31 |
run 32153713546executed 681 - ccache 442 hit / 4124 miss - head a86e696e8 - digest sha256:ced1f5997dd355... - run 32153713546 | ||||||