[(known) BUG] DELETE/UPDATE more than one row in partitioned foreign table

6 patchsets tracked - current t51953_32

v32t51953_32posted 4 days agosuccessappliesrecent 0dpg 20

base66042bd3e about 15 hours ago on master

applyapplied about 15 hours ago

rebaselast tried about 15 hours ago on 66042bd3e

pushabout 15 hours ago -> 3a0eee559 branch diff vs base

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1049 / 1049	3m 00s / 5m 27s	`docker run ... :t51953`	about 15 hours ago
run 39732488750 executed 1049 - ccache 78 hit / 6544 miss - head 3a0eee559 - digest sha256:5b8f9287206fda... - run 39732488750
success	1	20	1049 / 1049	1m 54s / 4m 24s	`docker run ... @sha256:f2b2378...`	1 day ago
run 39553785376 executed 1049 - ccache 78 hit / 6544 miss - head 312721a6c - digest sha256:f2b237829619a4... - run 39553785376
success	1	20	1049 / 1049	2m 59s / 5m 47s	`docker run ... @sha256:d78a8a8...`	3 days ago
run 39377240793 executed 1049 - ccache 78 hit / 6544 miss - head 9b0d63d38 - digest sha256:d78a8a8174ab02... - run 39377240793
success	1	20	1049 / 1049	2m 11s / 4m 53s	`docker run ... @sha256:b3cfafd...`	4 days ago
run 39206478649 executed 1049 - ccache 78 hit / 6544 miss - head 37c07389c - digest sha256:b3cfafd0fcde6e... - run 39206478649

v29t51953_29posted Sep 22, 08:44successsupersededrecent 17dpg 20

based6393fc40 Oct 05, 07:15 on master

applyapplied Oct 05, 08:57

rebaselast tried 4 days ago on 45fc51fcb

Applying: postgres_fdw: Disambiguate row identity by remote tableoid too
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/sql/postgres_fdw.sql
M	doc/src/sgml/postgres-fdw.sgml
M	src/backend/optimizer/plan/initsplan.c
M	src/backend/optimizer/plan/setrefs.c
M	src/backend/optimizer/util/relnode.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/optimizer/util/relnode.c
Auto-merging src/backend/optimizer/plan/setrefs.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/setrefs.c
Auto-merging src/backend/optimizer/plan/initsplan.c
Auto-merging doc/src/sgml/postgres-fdw.sgml
Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql
Auto-merging contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
Patch failed at 0001 postgres_fdw: Disambiguate row identity by remote tableoid too

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/optimizer/plan/setrefs.c

pushOct 05, 08:57 -> 322c04926 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1039 / 1039	2m 58s / 5m 19s	`docker run ... @sha256:4f28ed3...`	Oct 05, 09:08
run 37286863506 executed 1039 - ccache 78 hit / 6544 miss - head 322c04926 - digest sha256:4f28ed33137724... - run 37286863506
success	1	20	1039 / 1039	2m 18s / 4m 28s	`docker run ... @sha256:8825410...`	Oct 04, 09:06
run 37190542487 executed 1039 - ccache 78 hit / 6544 miss - head 743d3fc1d - digest sha256:88254103b6b42b... - run 37190542487
success	1	20	1039 / 1039	2m 53s / 5m 26s	`docker run ... @sha256:9a40d4b...`	Oct 03, 09:05
run 37111289196 executed 1039 - ccache 78 hit / 6544 miss - head 665e0e067 - digest sha256:9a40d4b1f8f941... - run 37111289196
success	1	20	1039 / 1039	1m 50s / 4m 28s	`docker run ... @sha256:135e9ea...`	Oct 02, 09:02
run 36986702413 executed 1039 - ccache 78 hit / 6544 miss - head 4ecb3cd16 - digest sha256:135e9eae3d1ffd... - run 36986702413
success	1	20	1039 / 1039	2m 16s / 4m 53s	`docker run ... @sha256:5274221...`	Oct 01, 09:03
run 36839206965 executed 1039 - ccache 78 hit / 6544 miss - head 4c2db3ea1 - digest sha256:5274221562be16... - run 36839206965
success	1	20	1039 / 1039	2m 52s / 5m 28s	`docker run ... @sha256:7b34fcc...`	Sep 30, 09:04
run 36692554601 executed 1039 - ccache 78 hit / 6544 miss - head 4c6066cda - digest sha256:7b34fcc83e04ec... - run 36692554601
success	1	20	1039 / 1039	1m 53s / 4m 18s	`docker run ... @sha256:a9df053...`	Sep 29, 09:00
run 36545437179 executed 1039 - ccache 78 hit / 6544 miss - head d8a8ec319 - digest sha256:a9df053e772d37... - run 36545437179
success	1	20	1039 / 1039	2m 58s / 5m 38s	`docker run ... @sha256:ead9c45...`	Sep 28, 09:02
run 36399864333 executed 1039 - ccache 78 hit / 6544 miss - head df7a605cf - digest sha256:ead9c458dc7ddc... - run 36399864333
success	1	20	1039 / 1039	2m 30s / 4m 24s	`docker run ... @sha256:f329563...`	Sep 27, 09:00
run 36307510625 executed 1039 - ccache 78 hit / 6544 miss - head 899ca7e47 - digest sha256:f3295630af3a03... - run 36307510625
success	1	20	1039 / 1039	2m 38s / 4m 47s	`docker run ... @sha256:6e671eb...`	Sep 26, 09:01
run 36231021838 executed 1039 - ccache 78 hit / 6544 miss - head 0d5139fb3 - digest sha256:6e671eb5dc0574... - run 36231021838
success	1	20	1038 / 1038	2m 54s / 5m 35s	`docker run ... @sha256:59a1476...`	Sep 25, 09:01
run 36115069005 executed 1038 - ccache 78 hit / 6544 miss - head 07b264b97 - digest sha256:59a14767775986... - run 36115069005
success	1	20	1036 / 1036	2m 40s / 4m 42s	`docker run ... @sha256:28b712d...`	Sep 24, 08:59
run 35977499806 executed 1036 - ccache 98 hit / 6524 miss - head 9033c09be - digest sha256:28b712d1fd850e... - run 35977499806
success	1	20	1036 / 1036	2m 46s / 5m 25s	`docker run ... @sha256:4ce5ec4...`	Sep 23, 08:58
run 35839204187 executed 1036 - ccache 98 hit / 6524 miss - head e41532528 - digest sha256:4ce5ec4919ee36... - run 35839204187
success	1	20	1036 / 1036	2m 46s / 5m 24s	`docker run ... @sha256:98e9b37...`	Sep 22, 08:57
run 35706675209 executed 1036 - ccache 98 hit / 6524 miss - head b63504cdf - digest sha256:98e9b37e60b2ac... - run 35706675209

v26t51953_26posted Sep 10, 12:21successsupersededstale 31dpg 20

based39fda1cc Sep 21, 10:36 on master

applyapplied Sep 21, 19:20

rebaselast tried Sep 21, 19:20 on d39fda1cc

pushSep 21, 19:20 -> 74523f16f branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1036 / 1036	2m 57s / 5m 32s	`docker run ... @sha256:bd89a28...`	Sep 21, 19:31
run 35644210931 executed 1036 - ccache 98 hit / 6524 miss - head 74523f16f - digest sha256:bd89a2844d048b... - run 35644210931
success	1	20	1036 / 1036	2m 48s / 4m 48s	`docker run ... @sha256:75ae24b...`	Sep 20, 13:56
run 35514495237 executed 1036 - ccache 98 hit / 6524 miss - head f9bd0a728 - digest sha256:75ae24b40473da... - run 35514495237
success	1	20	1036 / 1036	2m 47s / 5m 18s	`docker run ... @sha256:6186a8a...`	Sep 19, 13:55
run 35446676790 executed 1036 - ccache 98 hit / 6524 miss - head 50ae4bb65 - digest sha256:6186a8ad0f7573... - run 35446676790
success	1	20	1036 / 1036	2m 53s / 5m 26s	`docker run ... @sha256:8e6e593...`	Sep 18, 13:54
run 35351886512 executed 1036 - ccache 98 hit / 6524 miss - head fd2722faa - digest sha256:8e6e5936942c96... - run 35351886512
success	1	20	1036 / 1036	2m 46s / 5m 26s	`docker run ... @sha256:3afc3b2...`	Sep 17, 13:50
run 35228522774 executed 1036 - ccache 98 hit / 6524 miss - head 8faea3fd2 - digest sha256:3afc3b20394e04... - run 35228522774
success	1	20	1036 / 1036	2m 55s / 5m 33s	`docker run ... @sha256:3e791e3...`	Sep 16, 13:42
run 35102499777 executed 1036 - ccache 98 hit / 6524 miss - head 2580c8bc9 - digest sha256:3e791e3c616f60... - run 35102499777
success	1	20	1036 / 1036	2m 11s / 4m 43s	`docker run ... @sha256:eaa7e90...`	Sep 15, 13:37
run 34975205469 executed 1036 - ccache 98 hit / 6523 miss - head 73159a479 - digest sha256:eaa7e90274d70c... - run 34975205469
success	1	20	1023 / 1023	2m 54s / 5m 25s	`docker run ... @sha256:668c628...`	Sep 14, 13:33
run 34848841396 executed 1023 - ccache 98 hit / 6523 miss - head ce9a1c2dd - digest sha256:668c628db8ec8c... - run 34848841396
success	1	20	1023 / 1023	2m 16s / 4m 18s	`docker run ... @sha256:f9e85c1...`	Sep 13, 12:53
run 34757909346 executed 1023 - ccache 98 hit / 6523 miss - head 80185e427 - digest sha256:f9e85c144206d1... - run 34757909346
success	1	20	1023 / 1023	2m 55s / 4m 59s	`docker run ... @sha256:4a3b50b...`	Sep 12, 12:41
run 34693719387 executed 1023 - ccache 98 hit / 6523 miss - head cb2582f65 - digest sha256:4a3b50bc3b550c... - run 34693719387
success	1	20	1022 / 1022	2m 56s / 5m 36s	`docker run ... @sha256:3ff5547...`	Sep 11, 12:43
run 34598906849 executed 1022 - ccache 98 hit / 6523 miss - head cc7068d27 - digest sha256:3ff5547bb5c9c0... - run 34598906849
success	1	20	1022 / 1022	2m 08s / 4m 07s	`docker run ... @sha256:eaa3d3f...`	Sep 10, 12:41
run 34476486168 executed 1022 - ccache 98 hit / 6523 miss - head fd85969ce - digest sha256:eaa3d3fbe9505c... - run 34476486168

v21t51953_21posted Aug 27, 09:20successsupersededstale 42dpg 20

basebd9d6ffa1 Sep 10, 07:11 on master

applyapplied Sep 10, 08:14

rebaselast tried Sep 10, 08:14 on bd9d6ffa1

pushSep 10, 08:14 -> 673747085 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1022 / 1022	2m 54s / 5m 29s	`docker run ... @sha256:64908c7...`	Sep 10, 08:26
run 34454072562 executed 1022 - ccache 98 hit / 6523 miss - head 673747085 - digest sha256:64908c75da4149... - run 34454072562
success	1	20	1020 / 1020	2m 35s / 4m 37s	`docker run ... @sha256:5ad70cf...`	Sep 09, 08:23
run 34327821611 executed 1020 - ccache 98 hit / 6523 miss - head df64fd5c2 - digest sha256:5ad70cfec74f42... - run 34327821611
success	1	20	1020 / 1020	2m 15s / 4m 46s	`docker run ... @sha256:e35bd71...`	Sep 08, 08:20
run 34203095613 executed 1020 - ccache 98 hit / 6523 miss - head b306419ee - digest sha256:e35bd71b212039... - run 34203095613
success	1	20	1024 / 1024	2m 55s / 5m 43s	`docker run ... @sha256:13c02b9...`	Sep 07, 08:19
run 34099038990 executed 1024 - ccache 98 hit / 6527 miss - head a6bc76661 - digest sha256:13c02b9c8c6181... - run 34099038990
success	1	20	1024 / 1024	2m 53s / 5m 38s	`docker run ... @sha256:4d8aeb8...`	Sep 05, 10:16
run 33959639640 executed 1024 - ccache 98 hit / 6527 miss - head 17816f305 - digest sha256:4d8aeb852f037f... - run 33959639640
success	1	20	1024 / 1024	2m 59s / 5m 45s	`docker run ... @sha256:54628d7...`	Sep 04, 10:16
run 33861278237 executed 1024 - ccache 98 hit / 6527 miss - head 2a52559f6 - digest sha256:54628d73609abf... - run 33861278237
success	1	20	1023 / 1023	2m 52s / 5m 31s	`docker run ... @sha256:9e07617...`	Sep 03, 10:07
run 33741605961 executed 1023 - ccache 98 hit / 6526 miss - head 3b62b90de - digest sha256:9e076175877b00... - run 33741605961
success	1	20	1022 / 1022	2m 52s / 5m 16s	`docker run ... @sha256:7adf4dd...`	Sep 02, 10:06
run 33616740732 executed 1022 - ccache 98 hit / 6526 miss - head d3b959786 - digest sha256:7adf4dd959fc88... - run 33616740732
success	1	20	1022 / 1022	2m 54s / 5m 17s	`docker run ... @sha256:a162d1a...`	Sep 01, 10:05
run 33494626299 executed 1022 - ccache 98 hit / 6526 miss - head 67b7f04f5 - digest sha256:a162d1a3e5e7bb... - run 33494626299
success	1	20	1022 / 1022	2m 56s / 5m 31s	`docker run ... @sha256:286c602...`	Aug 31, 09:42
run 33378107390 executed 1022 - ccache 98 hit / 6526 miss - head 409e6d6e6 - digest sha256:286c602a3ac0f9... - run 33378107390
success	1	20	1021 / 1021	3m 00s / 5m 09s	`docker run ... @sha256:f425fb9...`	Aug 30, 09:40
run 33304215789 executed 1021 - ccache 98 hit / 6525 miss - head 7ada1ae95 - digest sha256:f425fb901d76f8... - run 33304215789
success	1	20	1021 / 1021	2m 13s / 4m 13s	`docker run ... @sha256:1da6763...`	Aug 29, 09:37
run 33245580875 executed 1021 - ccache 98 hit / 6525 miss - head 2807125b3 - digest sha256:1da6763e269cbf... - run 33245580875
success	1	20	1021 / 1021	2m 54s / 5m 13s	`docker run ... @sha256:ef43710...`	Aug 28, 09:36
run 33159361569 executed 1021 - ccache 98 hit / 6525 miss - head a102aca9e - digest sha256:ef4371003714d9... - run 33159361569
success	1	20	1021 / 1021	2m 58s / 5m 49s	`docker run ... @sha256:e7e2f67...`	Aug 27, 09:34
run 33058359576 executed 1021 - ccache 98 hit / 6525 miss - head 9df0b63b3 - digest sha256:e7e2f675e2b546... - run 33058359576

v20t51953_20posted Jul 09, 14:03successsupersededstale 2mopg 20

basebe97b984f Aug 19, 03:37 on master

applyapplied Aug 19, 05:57

rebaselast tried Aug 27, 06:40 on ea9c9432c

Applying: DELETE/UPDATE more than one row in partitioned foreign table (2/2)
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/deparse.c
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/postgres_fdw.h
M	contrib/postgres_fdw/sql/postgres_fdw.sql
Falling back to patching base and 3-way merge...
Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql
Auto-merging contrib/postgres_fdw/postgres_fdw.h
Auto-merging contrib/postgres_fdw/postgres_fdw.c
CONFLICT (content): Merge conflict in contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
Auto-merging contrib/postgres_fdw/deparse.c
Patch failed at 0001 DELETE/UPDATE more than one row in partitioned foreign table (2/2)

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: contrib/postgres_fdw/postgres_fdw.c

pushAug 19, 05:57 -> 63a7d91fd branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1023 / 1023	2m 51s / 5m 27s	`docker run ... @sha256:efdbc29...`	Aug 19, 06:09
run 32221429000 executed 1023 - ccache 98 hit / 6525 miss - head 63a7d91fd - digest sha256:efdbc2930dba84... - run 32221429000
success	1	20	1020 / 1020	2m 47s / 5m 21s	`docker run ... @sha256:98ea050...`	Aug 18, 06:07
run 32104826450 executed 1020 - ccache 98 hit / 6524 miss - head 87bf2780d - digest sha256:98ea05014db9a4... - run 32104826450
success	1	20	1019 / 1019	2m 40s / 4m 47s	`docker run ... @sha256:1693101...`	Aug 17, 06:05
run 31999613575 executed 1019 - ccache 98 hit / 6524 miss - head a760259c2 - digest sha256:1693101c09ddd3... - run 31999613575
success	1	20	1019 / 1019	2m 51s / 5m 31s	`docker run ... @sha256:48238c1...`	Aug 16, 06:05
run 31930117266 executed 1019 - ccache 98 hit / 6524 miss - head ec52c6f94 - digest sha256:48238c16c315c6... - run 31930117266
success	1	20	1019 / 1019	2m 32s / 4m 27s	`docker run ... @sha256:1082dfd...`	Aug 15, 06:02
run 31868053785 executed 1019 - ccache 98 hit / 6524 miss - head 7152b7149 - digest sha256:1082dfd62936f6... - run 31868053785
success	1	20	1019 / 1019	2m 48s / 5m 07s	`docker run ... @sha256:6ac58cb...`	Aug 14, 06:03
run 31774384548 executed 1019 - ccache 165 hit / 6457 miss - head 9c61da246 - digest sha256:6ac58cb75c57d0... - run 31774384548
success	1	20	1019 / 1019	2m 47s / 5m 24s	`docker run ... @sha256:205138b...`	Aug 13, 06:03
run 31671779354 executed 1019 - ccache 165 hit / 6457 miss - head 1756725e1 - digest sha256:205138b8e46734... - run 31671779354
success	1	20	1019 / 1019	2m 55s / 5m 16s	`docker run ... @sha256:a52b2c9...`	Aug 12, 06:02
run 31567902185 executed 1019 - ccache 165 hit / 6454 miss - head 67c88de5b - digest sha256:a52b2c9b3670ff... - run 31567902185
success	1	20	1019 / 1019	2m 48s / 5m 12s	`docker run ... @sha256:984ca96...`	Aug 11, 06:00
run 31462938358 executed 1019 - ccache 165 hit / 6453 miss - head 964298b8c - digest sha256:984ca96add361d... - run 31462938358
success	1	20	1019 / 1019	2m 52s / 5m 27s	`docker run ... @sha256:aa2c538...`	Aug 10, 06:00
run 31359761061 executed 1019 - ccache 166 hit / 6452 miss - head d78bd61f9 - digest sha256:aa2c538f3e5304... - run 31359761061
success	1	20	1019 / 1019	2m 54s / 4m 49s	`docker run ... @sha256:4742792...`	Aug 08, 04:31
run 31239220095 executed 1019 - ccache 166 hit / 6452 miss - head 1345961b0 - digest sha256:4742792861efc3... - run 31239220095
success	1	20	1018 / 1018	2m 56s / 5m 39s	`docker run ... @sha256:949af86...`	Aug 07, 04:37
run 31147027620 executed 1018 - ccache 166 hit / 6452 miss - head ed8954dff - digest sha256:949af8641b2477... - run 31147027620
success	1	20	1018 / 1018	2m 45s / 5m 01s	`docker run ... @sha256:51e4e5f...`	Aug 05, 23:18
run 31055314300 executed 1018 - ccache 166 hit / 6452 miss - head d6208ded1 - digest sha256:51e4e5fccd24db... - run 31055314300
success	1	20	1018 / 1018	2m 48s / 5m 23s	`docker run ... @sha256:64b3a46...`	Aug 04, 23:16
run 30958837764 executed 1018 - ccache 166 hit / 6452 miss - head 62dd9742d - digest sha256:64b3a46004f5d8... - run 30958837764
success	1	20	1018 / 1018	3m 01s / 5m 34s	`docker run ... @sha256:eed8689...`	Aug 03, 23:16
run 30861021487 executed 1018 - ccache 166 hit / 6452 miss - head 9fa1f3d6d - digest sha256:eed86895e705ca... - run 30861021487
success	1	20	1017 / 1017	2m 48s / 5m 17s	`docker run ... @sha256:f85dfea...`	Aug 02, 23:14
run 30771460494 executed 1017 - ccache 166 hit / 6452 miss - head 5f82e15a6 - digest sha256:f85dfeaadfc566... - run 30771460494
success	1	20	1017 / 1017	2m 55s / 5m 29s	`docker run ... @sha256:cd802f9...`	Aug 01, 23:13
run 30722551172 executed 1017 - ccache 166 hit / 6452 miss - head f9c207930 - digest sha256:cd802f93894f13... - run 30722551172
success	1	20	1017 / 1017	3m 00s / 5m 40s	`docker run ... @sha256:fe091de...`	Jul 31, 23:13
run 30671757262 executed 1017 - ccache 166 hit / 6452 miss - head daf97d2c6 - digest sha256:fe091ded02188d... - run 30671757262
tests failed	1	20	1015 / 1016	2m 53s / 4m 46s	`docker run ... @sha256:8df25e3...`	Jul 30, 23:11
run 30589130912 failed: recovery/051_effective_wal_level executed 1016 - ccache 166 hit / 6452 miss - head 3c7d83607 - digest sha256:8df25e3dae38d7... - run 30589130912
success	1	20	1016 / 1016	2m 47s / 5m 15s	`docker run ... @sha256:1c78377...`	Jul 29, 23:09
run 30498020681 executed 1016 - ccache 166 hit / 6452 miss - head cdaefce53 - digest sha256:1c783776ee0655... - run 30498020681
success	1	20	1015 / 1015	2m 58s / 5m 24s	`docker run ... @sha256:2498fc5...`	Jul 28, 23:18
run 30406421597 executed 1015 - ccache 166 hit / 6452 miss - head 6a1db7128 - digest sha256:2498fc5f187c90... - run 30406421597

v10t51953_10posted Jun 05, 11:59successsupersededstale 5mopg 19

base8a86aa313 May 28, 11:58 - 147 days / 1358 commits behind master (from history)

applyapplied Jul 26, 22:53

rebaselast tried Jul 26, 22:53

Applying: postgres_fdw: Disallow UPDATE/DELETE in problematic cases.
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/sql/postgres_fdw.sql
Falling back to patching base and 3-way merge...
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
CONFLICT (content): Merge conflict in contrib/postgres_fdw/expected/postgres_fdw.out
Auto-merging contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql
CONFLICT (content): Merge conflict in contrib/postgres_fdw/sql/postgres_fdw.sql
Patch failed at 0001 postgres_fdw: Disallow UPDATE/DELETE in problematic cases.

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 set advice.mergeConflict false"

pushJul 26, 22:53 -> f6ce72fbd branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	19	1005 / 1005	2m 59s / 5m 37s	`docker run ... @sha256:aaa449b...`	Jul 26, 23:04
run 30224049233 executed 1005 - ccache 145 hit / 6474 miss - head f6ce72fbd - digest sha256:aaa449b8da56d2... - run 30224049233