Code-comment typos.
2 patchsets tracked - current t253627_3
v3t253627_3posted Nov 05, 22:04successneeds rebaserecent 15dpg 20
base8cb6b83e1 Nov 05, 20:43 on master
applyapplied Nov 05, 22:06
rebaselast tried about 11 hours ago on 9b5d4e333
Applying: fix typos in code comments Patch failed at 0001 fix typos in code comments error: sha1 information is lacking or useless (src/backend/executor/nodeModifyTable.c). error: could not build fake ancestor 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"
pushNov 05, 22:07 -> 17ade1a29branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1053 / 1053 | 2m 26s / 4m 59s | docker run ... :t253627 | Nov 05, 22:17 |
run 42118701713executed 1053 - ccache 78 hit / 6546 miss - head 17ade1a29 - digest sha256:7afe233fb67b81... - run 42118701713 | ||||||
v1t253627_1posted Sep 01, 04:00successsupersededstale 2mopg 20
basec68cba09d Sep 15, 02:30 on master
applyapplied Sep 15, 02:52
rebaselast tried Oct 14, 12:12 on eab68b1be
Applying: Trivial fix for comment typos Using index info to reconstruct a base tree... M src/backend/access/index/genam.c M src/include/mb/pg_wchar.h Falling back to patching base and 3-way merge... Auto-merging src/backend/access/index/genam.c CONFLICT (content): Merge conflict in src/backend/access/index/genam.c Patch failed at 0001 Trivial fix for comment typos 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/index/genam.c
pushSep 15, 02:52 -> 2bfba7e65branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1036 / 1036 | 2m 44s / 4m 50s | docker run ... @sha256:5746f78... | Sep 15, 03:02 |
run 34922828509executed 1036 - ccache 98 hit / 6523 miss - head 2bfba7e65 - digest sha256:5746f78ec83765... - run 34922828509 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 45s / 5m 07s | docker run ... @sha256:ef84570... | Sep 14, 03:02 |
run 34800614129executed 1023 - ccache 98 hit / 6523 miss - head a546a93ec - digest sha256:ef845704927584... - run 34800614129 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 52s / 5m 24s | docker run ... @sha256:6750c5e... | Sep 13, 02:50 |
run 34733556703executed 1023 - ccache 98 hit / 6523 miss - head aab6e8d21 - digest sha256:6750c5eb5711a6... - run 34733556703 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 58s / 5m 07s | - | Sep 12, 02:45 |
run 34667954791executed 1023 - ccache 98 hit / 6523 miss - head 16bb410c1 - run 34667954791 | ||||||
| success | 1 | 20 | 1022 / 1022 | 2m 48s / 5m 09s | docker run ... @sha256:7c44f9b... | Sep 11, 02:42 |
run 34554884744executed 1022 - ccache 98 hit / 6523 miss - head dda16d046 - digest sha256:7c44f9b098f7b4... - run 34554884744 | ||||||
| success | 1 | 20 | 1021 / 1021 | 2m 53s / 5m 16s | docker run ... @sha256:ec99842... | Sep 10, 02:40 |
run 34429563322executed 1021 - ccache 98 hit / 6523 miss - head a86fbd848 - digest sha256:ec998421737fff... - run 34429563322 | ||||||
| success | 1 | 20 | 1020 / 1020 | 2m 47s / 5m 18s | docker run ... @sha256:a6811dc... | Sep 09, 02:37 |
run 34302980064executed 1020 - ccache 98 hit / 6523 miss - head 30655cebe - digest sha256:a6811dc1812056... - run 34302980064 | ||||||
| success | 1 | 20 | 1020 / 1020 | 2m 37s / 4m 44s | docker run ... @sha256:2b197fd... | Sep 08, 02:34 |
run 34179738051executed 1020 - ccache 98 hit / 6523 miss - head bcbc31ac8 - digest sha256:2b197fdd1eac49... - run 34179738051 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 53s / 4m 58s | docker run ... @sha256:ab587b0... | Sep 07, 02:31 |
run 34075795831executed 1024 - ccache 98 hit / 6527 miss - head 6f91fc6fb - digest sha256:ab587b0309eac8... - run 34075795831 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 54s / 5m 14s | docker run ... @sha256:5591e44... | Sep 05, 04:21 |
run 33943760178executed 1024 - ccache 98 hit / 6527 miss - head 40089caa4 - digest sha256:5591e44ce7830b... - run 33943760178 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 57s / 5m 11s | docker run ... @sha256:f268824... | Sep 04, 04:19 |
run 33835585009executed 1024 - ccache 98 hit / 6527 miss - head b2f54c3c8 - digest sha256:f268824acdcf48... - run 33835585009 | ||||||
| success | 1 | 20 | 1023 / 1023 | 3m 01s / 5m 34s | - | Sep 03, 04:18 |
run 33713714426executed 1023 - ccache 98 hit / 6526 miss - head d2897ea20 - run 33713714426 | ||||||
| success | 1 | 20 | 1022 / 1022 | 1m 59s / 4m 12s | docker run ... @sha256:a27fddf... | Sep 02, 04:15 |
run 33589333379executed 1022 - ccache 98 hit / 6526 miss - head 5b88d1dbc - digest sha256:a27fddf77588a1... - run 33589333379 | ||||||
| success | 1 | 20 | 1022 / 1022 | 2m 14s / 4m 12s | docker run ... @sha256:68f16b9... | Sep 01, 04:12 |
run 33468352380executed 1022 - ccache 98 hit / 6526 miss - head 4c31ff932 - digest sha256:68f16b9bb1c40b... - run 33468352380 | ||||||