Fix stale column context after COPY FROM conversion errors

back to CI dashboard

2 patchsets tracked - current t254571_4

v4t254571_4posted Nov 06, 02:47tests failedneeds rebaserecent 13dpg 20
based0a4f6621 Nov 08, 08:21 on master
applyapplied Nov 09, 02:51
rebaselast tried about 7 hours ago on 9b5d4e333
Applying: Fix stale column context after COPY FROM conversion errors
Using index info to reconstruct a base tree...
M	src/backend/commands/copyfromparse.c
M	src/test/regress/expected/copy2.out
M	src/test/regress/sql/copy2.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/copy2.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/copy2.sql
Auto-merging src/test/regress/expected/copy2.out
CONFLICT (content): Merge conflict in src/test/regress/expected/copy2.out
Auto-merging src/backend/commands/copyfromparse.c
CONFLICT (content): Merge conflict in src/backend/commands/copyfromparse.c
Patch failed at 0001 Fix stale column context after COPY FROM conversion errors

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/copy2.sql, src/test/regress/expected/copy2.out, src/backend/commands/copyfromparse.c
pushNov 09, 02:51 -> 90809f9cfbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
tests failed120930 / 9311m 56s / 4m 13sdocker run ... :t254571Nov 09, 02:59
run 42553189406
failed: file_fdw/file_fdw
executed 931 - ccache 78 hit / 6539 miss - head 90809f9cf - digest sha256:8ab19ae79b47ad... - run 42553189406
tests failed120930 / 9312m 20s / 4m 30sdocker run ... @sha256:91dd3e3...Nov 06, 03:01
run 42152824685
failed: file_fdw/file_fdw
executed 931 - ccache 78 hit / 6539 miss - head a718e585e - digest sha256:91dd3e3bf6dd9e... - run 42152824685
v1t254571_1posted Nov 05, 06:43tests failedsupersededrecent 16dpg 20
basefc1900915 Nov 05, 04:19 on master
applyapplied Nov 05, 06:45
rebaselast tried Nov 05, 06:45 on fc1900915
pushNov 05, 06:45 -> fe1e46c54branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
tests failed120931 / 9323m 04s / 5m 14sdocker run ... @sha256:0f743bb...Nov 05, 06:56
run 41982600005
failed: file_fdw/file_fdw
executed 932 - ccache 78 hit / 6539 miss - head fe1e46c54 - digest sha256:0f743bb0462fbe... - run 41982600005