[Patch] ALTER SYSTEM READ ONLY

back to CI dashboard

1 patchset tracked - current t42532_195

v195t42532_195posted Apr 08, 2022successwon't retryancient 4ypg 15
base2258e76f9 Apr 08, 2022 - 1625 days / 11943 commits behind master (from history)
applyapplied Aug 18, 15:41
rebaselast tried Aug 18, 15:41 on 195e8e427
Applying: Create XLogAcceptWrites() function with code from StartupXLOG().
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Patch failed at 0001 Create XLogAcceptWrites() function with code from StartupXLOG().

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/access/transam/xlog.c
pushAug 18, 15:41 -> 9f77d710cbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success115652 / 6522m 12s / 4m 02sdocker run ... :t42532Aug 18, 15:50
run 32155985264
executed 652 - ccache 84 hit / 4318 miss - head 9f77d710c - digest sha256:eab9a821c87520... - run 32155985264