Add common function ReplicationOriginName.

back to CI dashboard

1 patchset tracked - current t46629_15

v15t46629_15posted Oct 11, 2022successwon't retryancient 4ypg 16
base26f7802be Sep 24, 2022 - 1456 days / 10809 commits behind master (from history)
applyapplied Aug 18, 15:31
rebaselast tried Aug 18, 15:31 on 195e8e427
Applying: Pass Size/size_t as a 2nd argument of snprintf()
Using index info to reconstruct a base tree...
M	src/backend/replication/logical/worker.c
M	src/backend/utils/adt/jsonb.c
M	src/bin/pg_dump/parallel.c
M	src/bin/pg_dump/pg_dump_sort.c
M	src/bin/psql/command.c
M	src/common/ip.c
M	src/interfaces/ecpg/ecpglib/execute.c
M	src/interfaces/ecpg/ecpglib/misc.c
M	src/interfaces/ecpg/ecpglib/prepare.c
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/fe-gssapi-common.c
M	src/interfaces/libpq/libpq-int.h
M	src/test/regress/pg_regress.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/pg_regress.c
Auto-merging src/interfaces/libpq/libpq-int.h
CONFLICT (content): Merge conflict in src/interfaces/libpq/libpq-int.h
Auto-merging src/interfaces/libpq/fe-gssapi-common.c
Auto-merging src/interfaces/libpq/fe-connect.c
Auto-merging src/interfaces/ecpg/ecpglib/prepare.c
Auto-merging src/interfaces/ecpg/ecpglib/misc.c
Auto-merging src/interfaces/ecpg/ecpglib/execute.c
Auto-merging src/common/ip.c
Auto-merging src/bin/psql/command.c
Auto-merging src/bin/pg_dump/pg_dump_sort.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump_sort.c
Auto-merging src/bin/pg_dump/parallel.c
Auto-merging src/backend/utils/adt/jsonb.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/jsonb.c
Auto-merging src/backend/replication/logical/worker.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/worker.c
Patch failed at 0001 Pass Size/size_t as a 2nd argument of snprintf()

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/interfaces/libpq/libpq-int.h, src/bin/pg_dump/pg_dump_sort.c, src/backend/utils/adt/jsonb.c, src/backend/replication/logical/worker.c
pushAug 18, 15:31 -> b9367eddbbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success116663 / 6632m 54s / 4m 19sdocker run ... :t46629Aug 18, 15:41
run 32154972411
executed 663 - ccache 93 hit / 4449 miss - head b9367eddb - digest sha256:b0dc784e349093... - run 32154972411