Refactor "mutually exclusive options" error reporting code in parse_subscription_options
1 patchset tracked - current t44250_54
v54t44250_54posted Jul 07, 2021successwon't retryancient 5ypg 15
base8aafb0261 Jul 06, 2021 - 1902 days / 13643 commits behind master (from history)
applyapplied Aug 18, 15:52
rebaselast tried Aug 18, 15:52 on 195e8e427
Applying: PS Fix v11. Using index info to reconstruct a base tree... M src/backend/commands/subscriptioncmds.c Falling back to patching base and 3-way merge... Auto-merging src/backend/commands/subscriptioncmds.c CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c Patch failed at 0001 PS Fix v11. 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/subscriptioncmds.c
pushAug 18, 15:52 -> 1e9998dfcbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 15 | 623 / 623 | 2m 15s / 3m 03s | docker run ... :t44250 | Aug 18, 16:03 |
run 32157128048executed 623 - ccache 189 hit / 4185 miss - head 1e9998dfc - digest sha256:88c9952fdcb7e5... - run 32157128048 | ||||||