Support a wildcard in backtrace_functions

back to CI dashboard

1 patchset tracked - current t48922_65

v65t48922_65posted Mar 18, 2025successwon't retryancient 2ypg 18
base65db3963a Mar 17, 2025 - 551 days / 4646 commits behind master (from base line)
applyapplied Aug 18, 14:34
rebaselast tried Aug 18, 14:34 on 195e8e427
Applying: Allow logging backtraces in more cases
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/utils/error/elog.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/utils/elog.h
M	src/include/utils/guc.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/guc.h
Auto-merging src/include/utils/elog.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
CONFLICT (content): Merge conflict in src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_tables.c
CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/utils/error/elog.c
Auto-merging doc/src/sgml/config.sgml
Patch failed at 0001 Allow logging backtraces in more 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 advice.mergeConflict false"
conflicts on master: src/backend/utils/misc/postgresql.conf.sample, src/backend/utils/misc/guc_tables.c
pushAug 18, 14:35 -> 6a7748dbabranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success118876 / 8762m 39s / 4m 09sdocker run ... :t48922Aug 18, 14:44
run 32149230783
executed 876 - ccache 87 hit / 6429 miss - head 6a7748dba - digest sha256:3e6d590291d55c... - run 32149230783