pgsql: Move any remaining files generated by pg_upgrade into an interna
1 patchset tracked - current t46599_35
v35t46599_35posted Oct 29, 2023successwon't retryancient 3ypg 17
basecccc6cdeb Sep 06, 2023 - 1109 days / 8701 commits behind master (from history)
applyapplied Aug 18, 15:03
rebaselast tried Aug 18, 15:03 on 195e8e427
Applying: Retry stat() and lstat() even in get_dirent_type() Using index info to reconstruct a base tree... M src/common/file_utils.c M src/include/port.h M src/port/dirmod.c Falling back to patching base and 3-way merge... Auto-merging src/port/dirmod.c CONFLICT (content): Merge conflict in src/port/dirmod.c Auto-merging src/include/port.h Auto-merging src/common/file_utils.c Patch failed at 0001 Retry stat() and lstat() even in get_dirent_type() 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/port/dirmod.c
pushAug 18, 15:03 -> fd1e023d0branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 17 | 778 / 778 | 2m 51s / 3m 13s | docker run ... :t46599 | Aug 18, 15:14 |
run 32152183477executed 778 - ccache 213 hit / 4358 miss - head fd1e023d0 - digest sha256:ceaaed4f8e34fa... - run 32152183477 | ||||||