pg_combinebackup does not detect missing files

back to CI dashboard

1 patchset tracked - current t49436_20

v20t49436_20posted Aug 02, 2024successwon't retryancient 2ypg 18
base8a53539bd Jul 26, 2024 - 757 days / 6120 commits behind master (from history)
applyapplied 5 days ago
rebaselast tried 5 days ago on 195e8e427
Applying: pg_combinebackup: Detect missing files when possible.
Using index info to reconstruct a base tree...
M	src/bin/pg_combinebackup/load_manifest.h
M	src/bin/pg_combinebackup/meson.build
M	src/bin/pg_combinebackup/pg_combinebackup.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_combinebackup/pg_combinebackup.c
CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/pg_combinebackup.c
Auto-merging src/bin/pg_combinebackup/meson.build
CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/meson.build
Auto-merging src/bin/pg_combinebackup/load_manifest.h
Patch failed at 0001 pg_combinebackup: Detect missing files when possible.

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/bin/pg_combinebackup/pg_combinebackup.c, src/bin/pg_combinebackup/meson.build
push5 days ago -> 3c1717410branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success118842 / 8422m 37s / 3m 36sdocker run ... :t494365 days ago
run 32150482030
executed 842 - ccache 76 hit / 6421 miss - head 3c1717410 - digest sha256:69325a5cecd7d4... - run 32150482030