Rename of varatt_external to varatt_external_oid
2 patchsets tracked - current t253665_3
v3t253665_3posted 6 days agosuccesswon't retryrecent 4dpg 20
base798bdcae8 5 days ago on master
applyapplied but changed nothing 3 days ago
patch applies but changes nothing - already in the base
rebaselast tried 5 days ago on 798bdcae8
push5 days ago -> 105e7d2f0branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1024 / 1024 | 2m 52s / 5m 08s | docker run ... :t253665 | 5 days ago |
run 33935984055executed 1024 - ccache 98 hit / 6527 miss - head 105e7d2f0 - digest sha256:126dd7ea92f7cb... - run 33935984055 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 56s / 5m 22s | docker run ... @sha256:ce403cb... | 6 days ago |
run 33825490903executed 1024 - ccache 98 hit / 6527 miss - head f4988fa54 - digest sha256:ce403cb0be9c6e... - run 33825490903 | ||||||
v1t253665_1posted 6 days agosuccesssupersededrecent 6dpg 20
base6fe9b6291 7 days ago - 6 days / 46 commits behind master (from history)
applyapplied 6 days ago
rebaselast tried 6 days ago on 2b3d11aae
Applying: Rename varatt_external to varatt_external_oid Using index info to reconstruct a base tree... M contrib/amcheck/verify_heapam.c M src/backend/access/heap/heaptoast.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/heap/heaptoast.c CONFLICT (content): Merge conflict in src/backend/access/heap/heaptoast.c Auto-merging contrib/amcheck/verify_heapam.c CONFLICT (content): Merge conflict in contrib/amcheck/verify_heapam.c Patch failed at 0001 Rename varatt_external to varatt_external_oid 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/heap/heaptoast.c, contrib/amcheck/verify_heapam.c
push6 days ago -> 1188ffde0branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1023 / 1023 | 2m 41s / 4m 35s | docker run ... @sha256:f00266c... | 6 days ago |
run 33818293534executed 1023 - ccache 98 hit / 6526 miss - head 1188ffde0 - digest sha256:f00266ceef42f4... - run 33818293534 | ||||||