BUG #16997: parameter server_encoding's category problem
1 patchset tracked - current t70721_7
v7t70721_7posted May 11, 2021successwon't retryancient 5ypg 14
basec2dc19342 May 10, 2021 - 1959 days / 13986 commits behind master (from history)
applyapplied Aug 18, 15:56
rebaselast tried Aug 18, 15:56 on 195e8e427
Applying: Adjust some GUCs and docs Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/utils/misc/guc.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/misc/guc.c CONFLICT (content): Merge conflict in src/backend/utils/misc/guc.c Auto-merging doc/src/sgml/config.sgml Patch failed at 0001 Adjust some GUCs and docs 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/misc/guc.c
pushAug 18, 15:57 -> 9113f2742branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 14 | 621 / 621 | 1m 47s / 2m 54s | docker run ... :t70721 | Aug 18, 16:05 |
run 32157532703executed 621 - ccache 128 hit / 4246 miss - head 9113f2742 - digest sha256:48e12ba86ee91e... - run 32157532703 | ||||||