An out-of-date comment in nodeIndexonlyscan.c

back to CI dashboard

1 patchset tracked - current t38690_13

v13t38690_13posted Jun 14, 2021successwon't retryancient 5ypg 14
baseb676ac443 Jun 11, 2021 - 1926 days / 13807 commits behind master (from history)
applyapplied Aug 18, 15:54
rebaselast tried Aug 18, 15:54 on 195e8e427
Applying: Use tuple-level SIREAD locks for index-only scans.
Using index info to reconstruct a base tree...
M	src/backend/executor/nodeIndexonlyscan.c
M	src/test/isolation/isolation_schedule
Falling back to patching base and 3-way merge...
Auto-merging src/test/isolation/isolation_schedule
CONFLICT (content): Merge conflict in src/test/isolation/isolation_schedule
Auto-merging src/backend/executor/nodeIndexonlyscan.c
Patch failed at 0001 Use tuple-level SIREAD locks for index-only scans.

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/test/isolation/isolation_schedule
pushAug 18, 15:54 -> 46c57fb0bbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success114625 / 6252m 15s / 3m 17sdocker run ... :t38690Aug 18, 16:03
run 32157252233
executed 625 - ccache 128 hit / 4246 miss - head 46c57fb0b - digest sha256:3ef7f98ed3beed... - run 32157252233