Protect against timestamp underflow in uuidv7(interval)
1 patchset tracked - current t248620_1
v1t248620_1posted Jun 23, 23:39successwon't retrystale 6mopg 19
base89210037a Mar 26, 03:12 - 180 days / 1715 commits behind master (from history)
applyapplied Jul 28, 23:56
rebaselast tried Jul 28, 23:56 on dd50eb914
Applying: Protect against timestamp underflow in uuidv7(interval) Using index info to reconstruct a base tree... M src/backend/utils/adt/uuid.c M src/test/regress/expected/uuid.out M src/test/regress/sql/uuid.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/uuid.sql CONFLICT (content): Merge conflict in src/test/regress/sql/uuid.sql Auto-merging src/test/regress/expected/uuid.out CONFLICT (content): Merge conflict in src/test/regress/expected/uuid.out Auto-merging src/backend/utils/adt/uuid.c CONFLICT (content): Merge conflict in src/backend/utils/adt/uuid.c Patch failed at 0001 Protect against timestamp underflow in uuidv7(interval) 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/regress/sql/uuid.sql, src/test/regress/expected/uuid.out, src/backend/utils/adt/uuid.c
pushJul 28, 23:56 -> 650ca5120branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 970 / 970 | 2m 56s / 5m 10s | docker run ... :t248620 | Jul 29, 00:08 |
run 30409594843executed 970 - ccache 78 hit / 6522 miss - head 650ca5120 - digest sha256:e3cc62fad7d012... - run 30409594843 | ||||||