[PATCH] trenary reloption type

back to CI dashboard

1 patchset tracked - current t52208_10

v10t52208_10posted May 10, 11:09successwon't retrystale 4mopg 19
basea0a0c0c20 May 05, 14:20 - 111 days / 955 commits behind master (from history)
applyapplied 7 days ago
rebaselast tried 7 days ago on 195e8e427
Applying: Convert `vacuum_index_cleanup` and GiST's `buffering` reloptions to ternary type
Using index info to reconstruct a base tree...
M	src/backend/access/common/reloptions.c
M	src/backend/commands/vacuum.c
M	src/include/utils/rel.h
M	src/test/regress/expected/gist.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/gist.out
Auto-merging src/include/utils/rel.h
CONFLICT (content): Merge conflict in src/include/utils/rel.h
Auto-merging src/backend/commands/vacuum.c
CONFLICT (content): Merge conflict in src/backend/commands/vacuum.c
Auto-merging src/backend/access/common/reloptions.c
CONFLICT (content): Merge conflict in src/backend/access/common/reloptions.c
Patch failed at 0001 Convert `vacuum_index_cleanup` and GiST's `buffering` reloptions to ternary type

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/include/utils/rel.h, src/backend/commands/vacuum.c, src/backend/access/common/reloptions.c
push7 days ago -> 88a533289branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success119999 / 9992m 52s / 5m 17sdocker run ... :t522087 days ago
run 32144765016
executed 999 - ccache 78 hit / 6541 miss - head 88a533289 - digest sha256:dfa8d6059da530... - run 32144765016