adding partitioned tables to publications
1 patchset tracked - current t41332_81
v81t41332_81posted Apr 17, 2020successwon't retryancient 6ypg 13
base12fb189bf Apr 11, 2020 - 2352 days / 16465 commits behind master (from history)
applyapplied Aug 18, 16:13
rebaselast tried Aug 18, 16:13 on 195e8e427
Applying: Rearrange some code in pgoutput.c Using index info to reconstruct a base tree... M src/backend/replication/pgoutput/pgoutput.c Falling back to patching base and 3-way merge... Auto-merging src/backend/replication/pgoutput/pgoutput.c CONFLICT (content): Merge conflict in src/backend/replication/pgoutput/pgoutput.c Patch failed at 0001 Rearrange some code in pgoutput.c 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/pgoutput/pgoutput.c
pushAug 18, 16:13 -> 103b6189abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 13 | 565 / 565 | 2m 05s / 3m 09s | docker run ... :t41332 | Aug 18, 16:23 |
run 32159148092executed 565 - ccache 136 hit / 4026 miss - head 103b6189a - digest sha256:c18d3eb199839d... - run 32159148092 | ||||||