libpqsrv_connect_params should call ProcessWalRcvInterrupts

back to CI dashboard

1 patchset tracked - current t48986_18

v18t48986_18posted Mar 21, 2025successwon't retryancient 2ypg 18
base55b454d0e Mar 18, 2025 - 550 days / 4628 commits behind master (from history)
applyapplied Aug 18, 14:34
rebaselast tried Aug 18, 14:34 on 195e8e427
Applying: Reapply "libpqwalreceiver: Convert to libpq-be-fe-helpers.h"
Using index info to reconstruct a base tree...
M	src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
CONFLICT (content): Merge conflict in src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
Patch failed at 0001 Reapply "libpqwalreceiver: Convert to libpq-be-fe-helpers.h"

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/replication/libpqwalreceiver/libpqwalreceiver.c
pushAug 18, 14:34 -> b1b2b6201branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success118876 / 8762m 48s / 4m 06sdocker run ... :t48986Aug 18, 14:44
run 32149193743
executed 876 - ccache 87 hit / 6437 miss - head b1b2b6201 - digest sha256:e9e205859ad8c6... - run 32149193743