The same 2PC data maybe recovered twice
1 patchset tracked - current t48127_13
v13t48127_13posted Jul 14, 2025successwon't retryancient 1ypg 19
base2633dae2e Jul 07, 2025 - 439 days / 3760 commits behind master (from history)
applyapplied Aug 18, 14:20
rebaselast tried Aug 18, 14:20 on 195e8e427
Applying: Fix 2PC file check logic in PrepareRedoAdd() Using index info to reconstruct a base tree... M src/backend/access/transam/twophase.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/transam/twophase.c CONFLICT (content): Merge conflict in src/backend/access/transam/twophase.c Patch failed at 0001 Fix 2PC file check logic in PrepareRedoAdd() 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/access/transam/twophase.c
pushAug 18, 14:20 -> 956f838a8branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 900 / 900 | 1m 52s / 3m 27s | docker run ... :t48127 | Aug 18, 14:33 |
run 32147735083executed 900 - ccache 96 hit / 6452 miss - head 956f838a8 - digest sha256:fde685f2f85a39... - run 32147735083 | ||||||