pgsql: Fix perltidy breaking perlcritic
1 patchset tracked - current t46569_6
v6t46569_6posted Sep 12, 2022successwon't retryancient 4ypg 16
baseb060f5779 Sep 12, 2022 - 1471 days / 10950 commits behind master (from history)
applyapplied Aug 18, 15:33
rebaselast tried Aug 18, 15:33 on 195e8e427
Applying: Use return value of eval instead of assigning inside string Using index info to reconstruct a base tree... M src/backend/catalog/Catalog.pm Falling back to patching base and 3-way merge... Auto-merging src/backend/catalog/Catalog.pm CONFLICT (content): Merge conflict in src/backend/catalog/Catalog.pm Patch failed at 0001 Use return value of eval instead of assigning inside string 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/catalog/Catalog.pm
pushAug 18, 15:33 -> 9d0d43e53branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 662 / 662 | 2m 45s / 4m 16s | docker run ... :t46569 | Aug 18, 15:44 |
run 32155203972executed 662 - ccache 93 hit / 4447 miss - head 9d0d43e53 - digest sha256:8acb36755dbfc2... - run 32155203972 | ||||||