Prevent premature startup of pg_upgrade targets
1 patchset tracked - current t253409_4
v4t253409_4posted Oct 13, 11:50successneeds rebaserecent 8dpg 20
baseeab68b1be Oct 14, 11:19 on master
applyapplied Oct 14, 11:59
rebaselast tried about 9 hours ago on 5ffb8c740
Applying: pg_upgrade: Prevent premature startup of the new cluster Using index info to reconstruct a base tree... M src/bin/pg_upgrade/pg_upgrade.c M src/bin/pg_upgrade/t/002_pg_upgrade.pl Falling back to patching base and 3-way merge... Auto-merging src/bin/pg_upgrade/t/002_pg_upgrade.pl Auto-merging src/bin/pg_upgrade/pg_upgrade.c CONFLICT (content): Merge conflict in src/bin/pg_upgrade/pg_upgrade.c Patch failed at 0001 pg_upgrade: Prevent premature startup of the new cluster 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/bin/pg_upgrade/pg_upgrade.c
pushOct 14, 11:59 -> 777516c35branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1045 / 1045 | 2m 13s / 4m 30s | docker run ... :t253409 | Oct 14, 12:08 |
run 38560530769executed 1045 - ccache 78 hit / 6544 miss - head 777516c35 - digest sha256:a5d4f758c83a7a... - run 38560530769 | ||||||
| success | 1 | 20 | 1044 / 1044 | 2m 53s / 5m 37s | docker run ... @sha256:40b926f... | Oct 13, 12:02 |
run 38393098814executed 1044 - ccache 78 hit / 6544 miss - head 984e4243f - digest sha256:40b926f5a47f62... - run 38393098814 | ||||||