Use TEXT_DUMP_HEADER macro instead of hard-coded string in pg_backup_archiver.c
1 patchset tracked - current t139825_3
v3t139825_3posted Jun 03, 09:07successwon't retrystale 3mopg 19
base020794ee4 May 13, 14:34 - 102 days / 877 commits behind master (from history)
applyapplied Jul 28, 14:49
rebaselast tried Jul 28, 14:49 on 8a045f760
Applying: Replace the hard-coded dump headers with macros Using index info to reconstruct a base tree... M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_archiver.h M src/bin/pg_dump/pg_dumpall.c Falling back to patching base and 3-way merge... Auto-merging src/bin/pg_dump/pg_dumpall.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dumpall.c Auto-merging src/bin/pg_dump/pg_backup_archiver.h Auto-merging src/bin/pg_dump/pg_backup_archiver.c Patch failed at 0001 Replace the hard-coded dump headers with macros 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_dump/pg_dumpall.c
pushJul 28, 14:49 -> 587ab0b7abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1002 / 1002 | 2m 55s / 5m 23s | docker run ... :t139825 | Jul 28, 15:04 |
run 30370308701executed 1002 - ccache 145 hit / 6474 miss - head 587ab0b7a - digest sha256:88c736c3af4d65... - run 30370308701 | ||||||