Fix comments to reference xlogrecovery.c
1 patchset tracked - current t139843_3
v3t139843_3posted Jun 04, 17:29successwon't retrystale 4mopg 19
base5cdec4231 May 06, 10:56 - 109 days / 933 commits behind master (from history)
applyapplied Jul 28, 14:41
rebaselast tried Jul 28, 14:41 on 8a045f760
Applying: Update comments to refer to the correct functions Using index info to reconstruct a base tree... M src/backend/access/transam/xact.c M src/backend/access/transam/xlogprefetcher.c M src/backend/postmaster/startup.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/transam/xlogprefetcher.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlogprefetcher.c Auto-merging src/backend/access/transam/xact.c Patch failed at 0001 Update comments to refer to the correct functions 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/xlogprefetcher.c
pushJul 28, 14:41 -> 10b93b60cbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 999 / 999 | 2m 46s / 5m 07s | docker run ... :t139843 | Jul 28, 14:53 |
run 30369656687executed 999 - ccache 78 hit / 6541 miss - head 10b93b60c - digest sha256:cc964e277920ac... - run 30369656687 | ||||||