Injection points: preloading and runtime arguments
1 patchset tracked - current t49657_18
v18t49657_18posted Aug 02, 2024tests failedwon't retryancient 2ypg 18
basec9e245739 Jul 26, 2024 - 758 days / 6121 commits behind master (from history)
applyapplied 6 days ago
rebaselast tried 6 days ago on 195e8e427
Applying: Add multixact CV sleep test Using index info to reconstruct a base tree... M src/backend/access/transam/multixact.c M src/test/modules/test_slru/Makefile M src/test/modules/test_slru/meson.build M src/test/modules/test_slru/test_slru--1.0.sql M src/test/modules/test_slru/test_slru.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/test_slru/test_slru.c Auto-merging src/test/modules/test_slru/test_slru--1.0.sql CONFLICT (content): Merge conflict in src/test/modules/test_slru/test_slru--1.0.sql CONFLICT (add/add): Merge conflict in src/test/modules/test_slru/t/001_multixact.pl Auto-merging src/test/modules/test_slru/t/001_multixact.pl Auto-merging src/test/modules/test_slru/meson.build CONFLICT (content): Merge conflict in src/test/modules/test_slru/meson.build Auto-merging src/test/modules/test_slru/Makefile CONFLICT (content): Merge conflict in src/test/modules/test_slru/Makefile Auto-merging src/backend/access/transam/multixact.c CONFLICT (content): Merge conflict in src/backend/access/transam/multixact.c Patch failed at 0001 Add multixact CV sleep test 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/modules/test_slru/test_slru--1.0.sql, src/test/modules/test_slru/t/001_multixact.pl, src/test/modules/test_slru/meson.build, src/test/modules/test_slru/Makefile, src/backend/access/transam/multixact.c
push6 days ago -> e413a99cdbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| tests failed | 1 | 18 | 829 / 830 | 2m 48s / 3m 30s | docker run ... :t49657 | 6 days ago |
run 32150459697failed: test_slru/001_multixact executed 830 - ccache 76 hit / 6421 miss - head e413a99cd - digest sha256:781bc3d5572b32... - run 32150459697 | ||||||