[PATCH] replace float8 with int in date2isoweek() and date2isoyear()
1 patchset tracked - current t51907_3
v3t51907_3posted Jul 13, 2025successwon't retryancient 1ypg 19
base0059bbe1e Jul 03, 2025 - 443 days / 3773 commits behind master (from history)
applyapplied Aug 18, 14:20
rebaselast tried Aug 18, 14:20 on 195e8e427
Applying: Replace float8 with int in date2isoweek and date2isoyear Using index info to reconstruct a base tree... M src/backend/utils/adt/timestamp.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/adt/timestamp.c CONFLICT (content): Merge conflict in src/backend/utils/adt/timestamp.c Patch failed at 0001 Replace float8 with int in date2isoweek and date2isoyear 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/utils/adt/timestamp.c
pushAug 18, 14:20 -> 5ef3b5918branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 900 / 900 | 2m 48s / 4m 18s | docker run ... :t51907 | Aug 18, 14:33 |
run 32147753639executed 900 - ccache 96 hit / 6452 miss - head 5ef3b5918 - digest sha256:3e2a09a44095aa... - run 32147753639 | ||||||