subscription/015_stream sometimes breaks
1 patchset tracked - current t48331_14
v14t48331_14posted Aug 28, 2023successwon't retryancient 3ypg 17
base9c13b6814 Aug 25, 2023 - 1158 days / 9071 commits behind master (from history)
applyapplied Aug 18, 15:06
rebaselast tried Aug 18, 15:06 on 195e8e427
Applying: Fix am_xxx function Asserts Using index info to reconstruct a base tree... M src/include/replication/worker_internal.h Falling back to patching base and 3-way merge... Auto-merging src/include/replication/worker_internal.h CONFLICT (content): Merge conflict in src/include/replication/worker_internal.h Patch failed at 0001 Fix am_xxx function Asserts 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/replication/worker_internal.h
pushAug 18, 15:06 -> 2b1cf8695branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 17 | 781 / 781 | 2m 51s / 3m 27s | docker run ... :t48331 | Aug 18, 15:15 |
run 32152487391executed 781 - ccache 213 hit / 4359 miss - head 2b1cf8695 - digest sha256:ce40b6c65140ce... - run 32152487391 | ||||||