smgrzeroextend clarification
1 patchset tracked - current t47837_11
v11t47837_11posted May 19, 2023successwon't retryancient 3ypg 16
base803b4a26c May 19, 2023 - 1219 days / 9218 commits behind master (from history)
applyapplied Aug 18, 15:12
rebaselast tried Aug 18, 15:12 on 195e8e427
Applying: WIP: Improve smgr source code comments Using index info to reconstruct a base tree... M src/backend/storage/smgr/md.c M src/backend/storage/smgr/smgr.c Falling back to patching base and 3-way merge... Auto-merging src/backend/storage/smgr/smgr.c CONFLICT (content): Merge conflict in src/backend/storage/smgr/smgr.c Auto-merging src/backend/storage/smgr/md.c CONFLICT (content): Merge conflict in src/backend/storage/smgr/md.c Patch failed at 0001 WIP: Improve smgr source code comments 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/storage/smgr/smgr.c, src/backend/storage/smgr/md.c
pushAug 18, 15:12 -> acf3ab452branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 777 / 777 | 2m 52s / 4m 41s | docker run ... :t47837 | Aug 18, 15:25 |
run 32153085937executed 777 - ccache 104 hit / 4468 miss - head acf3ab452 - digest sha256:dbe5ac807ba5cf... - run 32153085937 | ||||||