partition routing layering in nodeModifyTable.c
1 patchset tracked - current t40948_82
v82t40948_82posted Oct 28, 2020successwon't retryancient 6ypg 14
base20d3fe900 Oct 26, 2020 - 2154 days / 15355 commits behind master (from history)
applyapplied Aug 18, 16:06
rebaselast tried Aug 18, 16:06 on 195e8e427
Applying: Call BeginDirectModify from ExecInitModifyTable Using index info to reconstruct a base tree... M src/backend/executor/nodeForeignscan.c M src/backend/executor/nodeModifyTable.c Falling back to patching base and 3-way merge... Auto-merging src/backend/executor/nodeModifyTable.c CONFLICT (content): Merge conflict in src/backend/executor/nodeModifyTable.c Auto-merging src/backend/executor/nodeForeignscan.c CONFLICT (content): Merge conflict in src/backend/executor/nodeForeignscan.c Patch failed at 0001 Call BeginDirectModify from ExecInitModifyTable 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/executor/nodeModifyTable.c, src/backend/executor/nodeForeignscan.c
pushAug 18, 16:06 -> 46a1db05dbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 14 | 585 / 585 | 2m 05s / 3m 07s | docker run ... :t40948 | Aug 18, 16:15 |
run 32158459270executed 585 - ccache 208 hit / 4119 miss - head 46a1db05d - digest sha256:b8d1b2d751eacb... - run 32158459270 | ||||||