remove VersionedQuery support from psql tab completion

1 patchset tracked - current t248722_1

v1t248722_1posted Jul 02, 18:51successneeds rebaserecent 13dpg 20

basef836b688f Sep 07, 02:50 on master

applyapplied Sep 07, 05:46

rebaselast tried about 7 hours ago on 9e17d25e7

Applying: remove VersionedQuery support from psql tab completion
Using index info to reconstruct a base tree...
M	src/bin/psql/tab-complete.in.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/psql/tab-complete.in.c
CONFLICT (content): Merge conflict in src/bin/psql/tab-complete.in.c
Patch failed at 0001 remove VersionedQuery support from psql tab completion

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/bin/psql/tab-complete.in.c

pushSep 07, 05:47 -> facc112c0 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1024 / 1024	1m 54s / 4m 01s	`docker run ... :t248722`	Sep 07, 05:56
run 34088129392 executed 1024 - ccache 98 hit / 6527 miss - head facc112c0 - digest sha256:839bbe5a2ff96b... - run 34088129392
success	1	20	1024 / 1024	2m 52s / 5m 23s	`docker run ... @sha256:45b1caf...`	Sep 05, 07:48
run 33953030871 executed 1024 - ccache 98 hit / 6527 miss - head 64adb988e - digest sha256:45b1caf2906560... - run 33953030871
success	1	20	1024 / 1024	2m 51s / 5m 16s	`docker run ... @sha256:8c1290c...`	Sep 04, 07:48
run 33849463445 executed 1024 - ccache 98 hit / 6527 miss - head c8fb4a2ea - digest sha256:8c1290c71d8a7c... - run 33849463445
success	1	20	1023 / 1023	2m 58s / 5m 39s	`docker run ... @sha256:2236d37...`	Sep 03, 07:46
run 33728694153 executed 1023 - ccache 98 hit / 6526 miss - head 6ab77c548 - digest sha256:2236d3722b5ef7... - run 33728694153
success	1	20	1022 / 1022	2m 52s / 5m 28s	`docker run ... @sha256:7c2ec44...`	Sep 02, 07:43
run 33604048851 executed 1022 - ccache 98 hit / 6526 miss - head dac6f5e6e - digest sha256:7c2ec4433554b0... - run 33604048851
success	1	20	1022 / 1022	2m 55s / 5m 26s	`docker run ... @sha256:05d77e5...`	Sep 01, 07:48
run 33482473496 executed 1022 - ccache 98 hit / 6526 miss - head a2615d9dc - digest sha256:05d77e5d60d50f... - run 33482473496
success	1	20	1022 / 1022	2m 52s / 5m 28s	`docker run ... @sha256:2f0c9e7...`	Aug 31, 07:26
run 33367194260 executed 1022 - ccache 98 hit / 6526 miss - head 061d43509 - digest sha256:2f0c9e7440ecfa... - run 33367194260
success	1	20	1021 / 1021	2m 53s / 5m 28s	`docker run ... @sha256:b68f52b...`	Aug 30, 07:20
run 33298489202 executed 1021 - ccache 98 hit / 6525 miss - head 08336122a - digest sha256:b68f52b4619bb9... - run 33298489202
success	1	20	1021 / 1021	2m 52s / 5m 37s	`docker run ... @sha256:33c97cb...`	Aug 29, 07:20
run 33240048883 executed 1021 - ccache 98 hit / 6525 miss - head 22b4bcc37 - digest sha256:33c97cbca4089b... - run 33240048883
success	1	20	1021 / 1021	2m 51s / 4m 49s	`docker run ... @sha256:b6c7e78...`	Aug 28, 07:06
run 33149643196 executed 1021 - ccache 98 hit / 6525 miss - head 6d79df552 - digest sha256:b6c7e78db93fd6... - run 33149643196
success	1	20	1021 / 1021	2m 56s / 5m 34s	`docker run ... @sha256:7105a65...`	Aug 27, 07:05
run 33047565166 executed 1021 - ccache 98 hit / 6525 miss - head 3bd852f7e - digest sha256:7105a6564bf3f2... - run 33047565166
success	1	20	1024 / 1024	2m 17s / 4m 48s	`docker run ... @sha256:565e0d1...`	Aug 26, 06:40
run 32938447288 executed 1024 - ccache 98 hit / 6525 miss - head 927ed7cf4 - digest sha256:565e0d1c2afe9e... - run 32938447288
success	1	20	1024 / 1024	2m 59s / 5m 41s	`docker run ... @sha256:9454c04...`	Aug 25, 06:35
run 32816741476 executed 1024 - ccache 98 hit / 6525 miss - head 1e1be05bc - digest sha256:9454c04e9108d6... - run 32816741476
success	1	20	1023 / 1023	1m 48s / 3m 55s	`docker run ... @sha256:d6446cf...`	Aug 24, 06:31
run 32697041911 executed 1023 - ccache 98 hit / 6525 miss - head 9899ee7d2 - digest sha256:d6446cfb44c80e... - run 32697041911
success	1	20	1023 / 1023	2m 45s / 4m 36s	`docker run ... @sha256:96a04b5...`	Aug 23, 06:31
run 32622674178 executed 1023 - ccache 98 hit / 6525 miss - head 61365bc45 - digest sha256:96a04b512a6828... - run 32622674178
success	1	20	1023 / 1023	2m 56s / 5m 36s	`docker run ... @sha256:0867364...`	Aug 22, 06:30
run 32556650460 executed 1023 - ccache 98 hit / 6525 miss - head 582b6e992 - digest sha256:0867364253264a... - run 32556650460
success	1	20	1023 / 1023	2m 53s / 5m 19s	`docker run ... @sha256:41344dd...`	Aug 21, 06:28
run 32453792320 executed 1023 - ccache 98 hit / 6525 miss - head b1d13e1bb - digest sha256:41344ddd49ab06... - run 32453792320
success	1	20	1023 / 1023	2m 50s / 5m 08s	`docker run ... @sha256:f6bdd07...`	Aug 20, 06:29
run 32338893741 executed 1023 - ccache 98 hit / 6525 miss - head 6d4dfe8c4 - digest sha256:f6bdd07ecfd92b... - run 32338893741
success	1	20	1023 / 1023	2m 11s / 4m 49s	`docker run ... @sha256:34c63fe...`	Aug 19, 06:25
run 32222574196 executed 1023 - ccache 98 hit / 6525 miss - head 50f7547e7 - digest sha256:34c63fe1bbb11a... - run 32222574196
success	1	20	1020 / 1020	2m 19s / 4m 27s	`docker run ... @sha256:44115c0...`	Aug 18, 06:23
run 32105979578 executed 1020 - ccache 98 hit / 6524 miss - head 537842c5c - digest sha256:44115c040a7513... - run 32105979578
success	1	20	1019 / 1019	2m 13s / 4m 43s	`docker run ... @sha256:db7a6b9...`	Aug 17, 06:23
run 32000673121 executed 1019 - ccache 98 hit / 6524 miss - head 94892caa4 - digest sha256:db7a6b90c4b7ca... - run 32000673121
success	1	20	1019 / 1019	2m 47s / 4m 38s	`docker run ... @sha256:0b01ec3...`	Aug 16, 06:21
run 31930799651 executed 1019 - ccache 98 hit / 6524 miss - head 1daf85093 - digest sha256:0b01ec33191314... - run 31930799651
success	1	20	1019 / 1019	2m 48s / 5m 28s	`docker run ... @sha256:398b52f...`	Aug 15, 06:20
run 31868734905 executed 1019 - ccache 98 hit / 6524 miss - head 00cc534b5 - digest sha256:398b52f56891a5... - run 31868734905
success	1	20	1019 / 1019	2m 49s / 5m 43s	`docker run ... @sha256:4af1871...`	Aug 14, 06:19
run 31775291404 executed 1019 - ccache 165 hit / 6457 miss - head 397e32561 - digest sha256:4af18713026aab... - run 31775291404
success	1	20	1019 / 1019	2m 47s / 5m 19s	`docker run ... @sha256:866b0e0...`	Aug 13, 06:18
run 31672663714 executed 1019 - ccache 165 hit / 6457 miss - head 5a04ffc1f - digest sha256:866b0e0fd1cfcb... - run 31672663714
success	1	20	1019 / 1019	2m 53s / 5m 29s	`docker run ... @sha256:eccff73...`	Aug 12, 06:17
run 31568760123 executed 1019 - ccache 165 hit / 6454 miss - head ec8ac0d72 - digest sha256:eccff730252164... - run 31568760123
success	1	20	1019 / 1019	2m 10s / 4m 38s	`docker run ... @sha256:24c3d28...`	Aug 11, 06:14
run 31463806927 executed 1019 - ccache 165 hit / 6453 miss - head 8bd9f3194 - digest sha256:24c3d28910f974... - run 31463806927
success	1	20	1019 / 1019	2m 53s / 5m 30s	`docker run ... @sha256:dd83d32...`	Aug 10, 06:23
run 31360541879 executed 1019 - ccache 166 hit / 6452 miss - head 3428a241a - digest sha256:dd83d32c008ddb... - run 31360541879
success	1	20	1019 / 1019	2m 42s / 5m 11s	`docker run ... @sha256:8381e53...`	Aug 08, 04:53
run 31240012816 executed 1019 - ccache 166 hit / 6452 miss - head 53837269f - digest sha256:8381e53a8f869c... - run 31240012816
success	1	20	1018 / 1018	2m 47s / 5m 23s	`docker run ... @sha256:712ed4c...`	Aug 07, 04:50
run 31148089150 executed 1018 - ccache 166 hit / 6452 miss - head 135e54ff0 - digest sha256:712ed4c494e49d... - run 31148089150
success	1	20	1018 / 1018	2m 56s / 5m 27s	`docker run ... @sha256:bff5a95...`	Aug 05, 23:44
run 31056773185 executed 1018 - ccache 166 hit / 6452 miss - head f63fc1132 - digest sha256:bff5a95e6c3a96... - run 31056773185
success	1	20	1018 / 1018	2m 57s / 5m 38s	`docker run ... @sha256:24f8401...`	Aug 04, 23:43
run 30960320115 executed 1018 - ccache 166 hit / 6452 miss - head 4c843c617 - digest sha256:24f8401eecc69f... - run 30960320115
success	1	20	1018 / 1018	2m 45s / 5m 10s	`docker run ... @sha256:5933cf1...`	Aug 03, 23:41
run 30862528422 executed 1018 - ccache 166 hit / 6452 miss - head 2d91951e7 - digest sha256:5933cf17d1a022... - run 30862528422
success	1	20	1017 / 1017	2m 55s / 5m 42s	`docker run ... @sha256:8d0e4e5...`	Aug 02, 23:40
run 30772368884 executed 1017 - ccache 166 hit / 6452 miss - head d63d84ee9 - digest sha256:8d0e4e5dad6fdf... - run 30772368884
success	1	20	1017 / 1017	2m 39s / 4m 42s	`docker run ... @sha256:93056a6...`	Aug 01, 23:38
run 30723402347 executed 1017 - ccache 166 hit / 6452 miss - head c5ab4492c - digest sha256:93056a61c48f63... - run 30723402347
success	1	20	1017 / 1017	2m 51s / 5m 33s	`docker run ... @sha256:a5d7940...`	Jul 31, 23:38
run 30672917079 executed 1017 - ccache 166 hit / 6452 miss - head 3e14be5de - digest sha256:a5d79404ec290d... - run 30672917079
success	1	20	1016 / 1016	2m 52s / 5m 31s	`docker run ... @sha256:2e0fde0...`	Jul 30, 23:36
run 30590474094 executed 1016 - ccache 166 hit / 6452 miss - head 9a69badb3 - digest sha256:2e0fde039f48d0... - run 30590474094
success	1	20	1016 / 1016	1m 55s / 4m 11s	`docker run ... @sha256:05ec578...`	Jul 29, 23:33
run 30499400971 executed 1016 - ccache 166 hit / 6452 miss - head 75ebcf02d - digest sha256:05ec5787e461b2... - run 30499400971
success	1	20	1015 / 1015	2m 39s / 4m 40s	`docker run ... @sha256:4a204aa...`	Jul 28, 23:42
run 30407731315 executed 1015 - ccache 166 hit / 6452 miss - head 1241f5b25 - digest sha256:4a204aa70b8268... - run 30407731315