CREATE TABLE LIKE INCLUDING PRIVILEGES
1 patchset tracked - current t139824_1
v1t139824_1posted Jun 03, 07:32successwon't retrystale 7mopg 19
based14f69a32 Apr 22, 16:47 - 213 days / 1960 commits behind master (from history)
applyapplied Jul 28, 14:51
rebaselast tried Jul 28, 14:51 on 8a045f760
Applying: CREATE TABLE LIKE INCLUDING PRIVILEGES Using index info to reconstruct a base tree... M src/backend/catalog/aclchk.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/nodes/parsenodes.h M src/test/regress/expected/create_table_like.out M src/test/regress/expected/privileges.out M src/test/regress/sql/create_table_like.sql M src/test/regress/sql/privileges.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/privileges.sql Auto-merging src/test/regress/sql/create_table_like.sql CONFLICT (content): Merge conflict in src/test/regress/sql/create_table_like.sql Auto-merging src/test/regress/expected/privileges.out Auto-merging src/test/regress/expected/create_table_like.out CONFLICT (content): Merge conflict in src/test/regress/expected/create_table_like.out Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/catalog/aclchk.c Patch failed at 0001 CREATE TABLE LIKE INCLUDING PRIVILEGES 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/create_table_like.sql, src/test/regress/expected/create_table_like.out
pushJul 28, 14:51 -> d86e5bb0bbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 999 / 999 | 2m 52s / 5m 03s | docker run ... :t139824 | Jul 28, 15:03 |
run 30370459650executed 999 - ccache 78 hit / 6540 miss - head d86e5bb0b - digest sha256:6f8ce611f52da4... - run 30370459650 | ||||||