Move backup-related code to xlogbackup.c/.h
1 patchset tracked - current t46685_28
v28t46685_28posted Oct 26, 2022successwon't retryancient 4ypg 16
base8328a15f8 Oct 24, 2022 - 1426 days / 10618 commits behind master (from history)
applyapplied Aug 18, 15:28
rebaselast tried Aug 18, 15:28 on 195e8e427
Applying: Move backup-related code from xlog.c to xlogbackup.c Using index info to reconstruct a base tree... M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogbackup.c M src/include/access/xlog.h M src/include/access/xlogbackup.h Falling back to patching base and 3-way merge... Auto-merging src/include/access/xlogbackup.h Auto-merging src/include/access/xlog.h Auto-merging src/backend/access/transam/xlogbackup.c Auto-merging src/backend/access/transam/xlog.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c Patch failed at 0001 Move backup-related code from xlog.c to xlogbackup.c 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/access/transam/xlog.c
pushAug 18, 15:28 -> 1c43d9a74branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 16 | 666 / 666 | 2m 47s / 4m 18s | docker run ... :t46685 | Aug 18, 15:40 |
run 32154701500executed 666 - ccache 213 hit / 4333 miss - head 1c43d9a74 - digest sha256:47e1aa4c725fcc... - run 32154701500 | ||||||