pgsql: Refactor background psql TAP functions
1 patchset tracked - current t232173_6
v6t232173_6posted May 17, 2023successwon't retryancient 3ypg 16
base7039c7cff May 02, 2023 - 1236 days / 9303 commits behind master (from history)
applyapplied Aug 18, 15:14
rebaselast tried Aug 18, 15:14 on 195e8e427
Applying: Add installation rules for AdjustUpgrade test module Using index info to reconstruct a base tree... M src/test/perl/Makefile M src/test/perl/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/perl/meson.build CONFLICT (content): Merge conflict in src/test/perl/meson.build Auto-merging src/test/perl/Makefile CONFLICT (content): Merge conflict in src/test/perl/Makefile Patch failed at 0001 Add installation rules for AdjustUpgrade test module 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/test/perl/meson.build, src/test/perl/Makefile
pushAug 18, 15:14 -> d1edd38b5branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 777 / 777 | 3m 04s / 5m 01s | docker run ... :t232173 | Aug 18, 15:25 |
run 32153260824executed 777 - ccache 104 hit / 4469 miss - head d1edd38b5 - digest sha256:a3e138ea713678... - run 32153260824 | ||||||