Improvements in Copy From
1 patchset tracked - current t42626_8
v8t42626_8posted Aug 30, 2020successwon't retryancient 6ypg 14
base0a0727ccf Jul 25, 2020 - 2309 days / 16517 commits behind master (from history)
applyapplied Aug 18, 16:07
rebaselast tried Aug 18, 16:07 on 195e8e427
Applying: Improvements in copy from. Using index info to reconstruct a base tree... M src/backend/commands/copy.c Falling back to patching base and 3-way merge... Auto-merging src/backend/commands/copy.c CONFLICT (content): Merge conflict in src/backend/commands/copy.c Patch failed at 0001 Improvements in copy from. 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/commands/copy.c
pushAug 18, 16:08 -> a45bbebe3branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 14 | 569 / 569 | 1m 36s / 2m 17s | docker run ... :t42626 | Aug 18, 16:15 |
run 32158604282executed 569 - ccache 202 hit / 4117 miss - head a45bbebe3 - digest sha256:4fb287b1c581e7... - run 32158604282 | ||||||