PoC: true in-place major version upgrades
1 patchset tracked - current t254296_1
v1t254296_1posted 4 days agobuild failedneeds rebaserecent 8dpg 20
basec105ab815 Oct 16, 13:38 - 8 days / 60 commits behind master (from history)
applyapplied 4 days ago
rebaselast tried about 4 hours ago on 0019a1ecf
Applying: Mock bumping magic numbers for mechanically testing in-place upgrade Using index info to reconstruct a base tree... M src/include/catalog/catversion.h Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/catversion.h CONFLICT (content): Merge conflict in src/include/catalog/catversion.h Patch failed at 0001 Mock bumping magic numbers for mechanically testing in-place upgrade 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/include/catalog/catversion.h
push4 days ago -> f7a556897branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| build failed | 1 | 20 | 0 / 0 | 1m 17s / 0m 00s | - | 4 days ago |
run 39518895778executed 0 - ccache 78 hit / 5979 miss - head f7a556897 - run 39518895778 | ||||||